diff options
| author | Sven Gothel <[email protected]> | 2013-01-31 14:11:46 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-01-31 14:11:46 +0100 |
| commit | 0634a2f9b4812b04dce4df466568184beac5c8cf (patch) | |
| tree | b0970602ac3bf9941490dc6a247bacd946364604 /make | |
| parent | a45d7b1d090a77cadfd7877dc0eb468d4970efc4 (diff) | |
Bump Android NDK to 'android-ndk-r8d' - Note: '-fno-use-linker-plugin' is required (?!)
Diffstat (limited to 'make')
| -rw-r--r-- | make/lib/gluegen-cpptasks-android-armv6.xml | 1 | ||||
| -rw-r--r-- | make/lib/gluegen-cpptasks-android-armv7.xml | 1 | ||||
| -rwxr-xr-x | make/scripts/make.gluegen.all.android-armv6-cross.sh | 17 | ||||
| -rwxr-xr-x | make/scripts/make.gluegen.all.android-armv7-cross.sh | 17 |
4 files changed, 20 insertions, 16 deletions
diff --git a/make/lib/gluegen-cpptasks-android-armv6.xml b/make/lib/gluegen-cpptasks-android-armv6.xml index a6db2bc..a48f5a3 100644 --- a/make/lib/gluegen-cpptasks-android-armv6.xml +++ b/make/lib/gluegen-cpptasks-android-armv6.xml @@ -75,6 +75,7 @@ <linker id="linker.cfg.android" name="gcc"> <linkerarg value="--sysroot=${env.TARGET_PLATFORM_ROOT}" /> <linkerarg value="-fpic" /> + <linkerarg value="-fno-use-linker-plugin" /> <linkerarg value="-march=armv6" /> <linkerarg value="-mfloat-abi=softfp" /> diff --git a/make/lib/gluegen-cpptasks-android-armv7.xml b/make/lib/gluegen-cpptasks-android-armv7.xml index dd7f5e9..9179ac4 100644 --- a/make/lib/gluegen-cpptasks-android-armv7.xml +++ b/make/lib/gluegen-cpptasks-android-armv7.xml @@ -75,6 +75,7 @@ <linker id="linker.cfg.android" name="gcc"> <linkerarg value="--sysroot=${env.TARGET_PLATFORM_ROOT}" /> <linkerarg value="-fpic" /> + <linkerarg value="-fno-use-linker-plugin" /> <linkerarg value="-march=armv7-a" /> <linkerarg value="-mfloat-abi=softfp" /> diff --git a/make/scripts/make.gluegen.all.android-armv6-cross.sh b/make/scripts/make.gluegen.all.android-armv6-cross.sh index a4c5916..157d7ab 100755 --- a/make/scripts/make.gluegen.all.android-armv6-cross.sh +++ b/make/scripts/make.gluegen.all.android-armv6-cross.sh @@ -30,14 +30,14 @@ if [ -z "$NDK_ROOT" ] ; then elif [ -e /opt/android-ndk ] ; then NDK_ROOT=/opt/android-ndk # - # Specific android-ndk-r7b + # Specific android-ndk-r8d # - elif [ -e /usr/local/android-ndk-r7b ] ; then - NDK_ROOT=/usr/local/android-ndk-r7b - elif [ -e /opt-linux-x86/android-ndk-r7b ] ; then - NDK_ROOT=/opt-linux-x86/android-ndk-r7b - elif [ -e /opt/android-ndk-r7b ] ; then - NDK_ROOT=/opt/android-ndk-r7b + elif [ -e /usr/local/android-ndk-r8d ] ; then + NDK_ROOT=/usr/local/android-ndk-r8d + elif [ -e /opt-linux-x86/android-ndk-r8d ] ; then + NDK_ROOT=/opt-linux-x86/android-ndk-r8d + elif [ -e /opt/android-ndk-r8d ] ; then + NDK_ROOT=/opt/android-ndk-r8d else echo NDK_ROOT is not specified and does not exist in default locations exit 1 @@ -70,7 +70,8 @@ export SOURCE_LEVEL=1.6 export TARGET_LEVEL=1.6 export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar -export GCC_VERSION=4.4.3 +#export GCC_VERSION=4.4.3 +export GCC_VERSION=4.7 HOST_ARCH=linux-x86 export TARGET_TRIPLE=arm-linux-androideabi diff --git a/make/scripts/make.gluegen.all.android-armv7-cross.sh b/make/scripts/make.gluegen.all.android-armv7-cross.sh index 3f64c58..4aff879 100755 --- a/make/scripts/make.gluegen.all.android-armv7-cross.sh +++ b/make/scripts/make.gluegen.all.android-armv7-cross.sh @@ -30,14 +30,14 @@ if [ -z "$NDK_ROOT" ] ; then elif [ -e /opt/android-ndk ] ; then NDK_ROOT=/opt/android-ndk # - # Specific android-ndk-r7b + # Specific android-ndk-r8d # - elif [ -e /usr/local/android-ndk-r7b ] ; then - NDK_ROOT=/usr/local/android-ndk-r7b - elif [ -e /opt-linux-x86/android-ndk-r7b ] ; then - NDK_ROOT=/opt-linux-x86/android-ndk-r7b - elif [ -e /opt/android-ndk-r7b ] ; then - NDK_ROOT=/opt/android-ndk-r7b + elif [ -e /usr/local/android-ndk-r8d ] ; then + NDK_ROOT=/usr/local/android-ndk-r8d + elif [ -e /opt-linux-x86/android-ndk-r8d ] ; then + NDK_ROOT=/opt-linux-x86/android-ndk-r8d + elif [ -e /opt/android-ndk-r8d ] ; then + NDK_ROOT=/opt/android-ndk-r8d else echo NDK_ROOT is not specified and does not exist in default locations exit 1 @@ -70,7 +70,8 @@ export SOURCE_LEVEL=1.6 export TARGET_LEVEL=1.6 export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar -export GCC_VERSION=4.4.3 +#export GCC_VERSION=4.4.3 +export GCC_VERSION=4.7 HOST_ARCH=linux-x86 export TARGET_TRIPLE=arm-linux-androideabi |