Merge backout of rev a3ea1a70905f

This commit is contained in:
Boris Zbarsky 2012-01-31 23:33:02 -05:00
commit 94ae1babe3
2 changed files with 4 additions and 4 deletions

View File

@ -9,8 +9,8 @@ ac_add_options --enable-application=mobile/android
ac_add_options --target=arm-linux-androideabi
ac_add_options --with-endian=little
ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
ac_add_options --with-android-sdk="/tools/android-sdk-r15/platforms/android-14"
ac_add_options --with-android-tools="/tools/android-sdk-r15/tools"
ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
ac_add_options --with-system-zlib

View File

@ -8,8 +8,8 @@ ac_add_options --enable-application=mobile/android
ac_add_options --target=arm-linux-androideabi
ac_add_options --with-endian=little
ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
ac_add_options --with-android-sdk="/tools/android-sdk-r15/platforms/android-14"
ac_add_options --with-android-tools="/tools/android-sdk-r15/tools"
ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
ac_add_options --with-system-zlib