summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2011-08-14 08:55:16 +0000
committerThomas Martitz <kugel@rockbox.org>2011-08-14 08:55:16 +0000
commitc6ca81329ab260699013a5a5ed99c0e7549cd94e (patch)
tree3032fc3ed44cc0f0a4427b817f70066df9b3ad4f /tools
parent5c6fe5da9c9676005f55e12aa9da867678ff8e5c (diff)
Android: Fix a few java warnings. Upgrade ndk platform to 2.0 (don't support 1.6 anymore).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30293 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
-rwxr-xr-xtools/configure4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/configure b/tools/configure
index 1cedebf787..b28d3c4c97 100755
--- a/tools/configure
+++ b/tools/configure
@@ -663,9 +663,9 @@ androidcc () {
prefixtools $gcctarget
GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//`
GCCOPTS="$GCCOPTS -ffunction-sections -march=armv5te -mtune=xscale -msoft-float -fomit-frame-pointer \
- --sysroot=$ANDROID_NDK_PATH/platforms/android-4/arch-arm"
+ --sysroot=$ANDROID_NDK_PATH/platforms/android-5/arch-arm"
GLOBAL_LDOPTS="$GLOBAL_LDOPTS -nostdlib -lc -Wl,--no-undefined -Wl,--gc-sections -Wl,-z,noexecstack \
- --sysroot=$ANDROID_NDK_PATH/platforms/android-4/arch-arm"
+ --sysroot=$ANDROID_NDK_PATH/platforms/android-5/arch-arm"
LDOPTS="$LDOPTS -shared -nostdlib -ldl -llog"
endian="little"
SHARED_LDFLAG="-shared"