diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-08-29 12:07:14 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-09-24 17:01:13 +0300 |
| commit | b4bb54dbc6b0b7f5a0a06b7a8d3c6c76beb3f75a (patch) | |
| tree | a5bf36f8282feee77c8264c1eb4960b1c3ff007c | |
| parent | cff0c7d492432842c45a9628e579a60b2ca5d542 (diff) | |
To avoid __dso_handle problems, use android-8, says Mike Hommey
private/tml/android-use-faulty.lib
Change-Id: I29e85f963ec01d52014d9f7917c2deefd149d6ae
| -rw-r--r-- | configure.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 51397f6847c2..48ab74745974 100644 --- a/configure.in +++ b/configure.in @@ -177,7 +177,7 @@ if test -n "$with_android_ndk"; then AC_MSG_ERROR([Can't figure out the toolchain prefix]) fi - test -z "$SYSBASE" && export SYSBASE=$ANDROID_NDK_HOME/platforms/android-9/arch-$android_cpu + test -z "$SYSBASE" && export SYSBASE=$ANDROID_NDK_HOME/platforms/android-8/arch-$android_cpu test -z "$AR" && AR=$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-ar test -z "$NM" && NM=$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-nm test -z "$OBJDUMP" && OBJDUMP=$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-objdump @@ -194,7 +194,7 @@ if test -n "$with_android_ndk"; then ANDROID_APP_ABI=x86 ANDROIDCFLAGS="-march=atom" fi - ANDROIDCFLAGS="$ANDROIDCFLAGS -Wno-psabi --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-$android_cpu -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR}libs/$ANDROID_APP_ABI" + ANDROIDCFLAGS="$ANDROIDCFLAGS -Wno-psabi --sysroot $ANDROID_NDK_HOME/platforms/android-8/arch-$android_cpu -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR}libs/$ANDROID_APP_ABI" # When using the 4.6 or newer toolchain, use the gold linker case "$with_android_ndk_toolchain_version" in @@ -504,7 +504,7 @@ linux-android*) fi # Verify that the NDK and SDK options are proper - if test ! -f "$ANDROID_NDK_HOME/platforms/android-9/arch-arm/usr/lib/libc.a"; then + if test ! -f "$ANDROID_NDK_HOME/platforms/android-8/arch-arm/usr/lib/libc.a"; then AC_MSG_ERROR([the --with-android-ndk option does not point to an Android NDK]) fi |