diff options
Diffstat (limited to 'thirdparties/patches/0001-solve-ndk-structure-problems.patch')
| -rw-r--r-- | thirdparties/patches/0001-solve-ndk-structure-problems.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/thirdparties/patches/0001-solve-ndk-structure-problems.patch b/thirdparties/patches/0001-solve-ndk-structure-problems.patch new file mode 100644 index 0000000..04bc75b --- /dev/null +++ b/thirdparties/patches/0001-solve-ndk-structure-problems.patch @@ -0,0 +1,58 @@ +Index: android-projects/root.mk +=================================================================== +--- android-projects/root.mk (revision 551) ++++ android-projects/root.mk (working copy) +@@ -2,10 +2,10 @@ + ## Root configuration file shared by all android projects. + ###### + +-export ANDROID_NDK_ROOT=/cygdrive/c/android-ndk-r4b ++export ANDROID_NDK_ROOT=/media/dati/projects/android-dk/android-ndk-r5b + export ANDROID_SDK_ROOT=/cygdrive/c/android-sdk + export ANDROID_PLATFORM=android-3 +-export ANDROID_HOST=windows ++export ANDROID_HOST=linux-x86 + export ANDROID_GCC_VER=4.4.0 + + +@@ -18,13 +18,30 @@ + # Path where to copy libraries (*.so) -on the device or emulator- + export LIB_DIR=/system/lib + ++# Test the NDK directory structure ++export ANDROID_NDK_BASE=$(shell if [ -r $(ANDROID_NDK_ROOT)/build/platforms ] ; then \ ++ echo $(ANDROID_NDK_ROOT)/build/platforms ; \ ++ elif [ -r $(ANDROID_NDK_ROOT)/platforms ] ; then \ ++ echo $(ANDROID_NDK_ROOT)/platforms ; \ ++ else \ ++ echo "Err_Unable_to_recognize_the_NDK_structure_for_ANDROID_NDK_BASE" ; \ ++ fi) ++ ++export ANDROID_NDK_TOOL_BASE=$(shell if [ -r $(ANDROID_NDK_ROOT)/build/prebuilt/$(ANDROID_HOST)/arm-eabi-$(ANDROID_GCC_VER) ] ; then \ ++ echo $(ANDROID_NDK_ROOT)/build/prebuilt/$(ANDROID_HOST)/arm-eabi-$(ANDROID_GCC_VER) ; \ ++ elif [ -r $(ANDROID_NDK_ROOT)/toolchains/arm-eabi-$(ANDROID_GCC_VER)/prebuilt/$(ANDROID_HOST) ] ; then \ ++ echo $(ANDROID_NDK_ROOT)/toolchains/arm-eabi-$(ANDROID_GCC_VER)/prebuilt/$(ANDROID_HOST) ; \ ++ else \ ++ echo "Err_Unable_to_recognize_the_NDK_structure_for_ANDROID_NDK_TOOL_BASE" ; \ ++ fi) ++ + ################################################################################## + + export AR=arm-eabi-ar + export CC=arm-eabi-gcc-$(ANDROID_GCC_VER) + export CPP=arm-eabi-g++ + +-export CFLAGS_COMMON=$(CFLAGS) $(DEBUG_FLAGS) -I$(ANDROID_NDK_ROOT)/build/platforms/$(ANDROID_PLATFORM)/arch-arm/usr/include \ ++export CFLAGS_COMMON=$(CFLAGS) $(DEBUG_FLAGS) -I$(ANDROID_NDK_BASE)/$(ANDROID_PLATFORM)/arch-arm/usr/include \ + -msoft-float \ + -fpic \ + -mthumb-interwork \ +@@ -57,7 +74,7 @@ + -DANDROID + #-mthumb + +-export LDFLAGS_COMMON=$(LDFLAGS) -Wl,-rpath=/system/lib,-rpath-link=$(ANDROID_NDK_ROOT)/build/platforms/$(ANDROID_PLATFORM)/arch-arm/usr/lib,-rpath-link=$(OUTPUT_DIR),-dynamic-linker=/system/bin/linker,-T,$(ANDROID_NDK_ROOT)/build/prebuilt/$(ANDROID_HOST)/arm-eabi-$(ANDROID_GCC_VER)/arm-eabi/lib/ldscripts/armelf.xsc -L$(ANDROID_NDK_ROOT)/build/platforms/$(ANDROID_PLATFORM)/arch-arm/usr/lib ++export LDFLAGS_COMMON=$(LDFLAGS) -Wl,-rpath=/system/lib,-rpath-link=$(ANDROID_NDK_BASE)/$(ANDROID_PLATFORM)/arch-arm/usr/lib,-rpath-link=$(OUTPUT_DIR),-dynamic-linker=/system/bin/linker,-T,$(ANDROID_NDK_TOOL_BASE)/arm-eabi/lib/ldscripts/armelf.xsc -L$(ANDROID_NDK_BASE)/$(ANDROID_PLATFORM)/arch-arm/usr/lib + export LDFLAGS_COMMON+=-nostdlib -lc -L$(OUTPUT_DIR) + + ifeq ($(BT), static) |
