From dd9d3011c2d51aab49925b6fd31c63a9b902d611 Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Mon, 6 May 2013 13:25:15 -0400 Subject: [PATCH] Use ndk-android-r7 for FirefoxOS builds. Commit 7445733 added support for FirefoxOS, but appears to have been using a newer version of the NDK than we typically build with. The codeaurora.org prebuilts repo we are tracking has not pulled in r8 yet and only provides r7. For the time being it would be helpful to drop back to r7. Admittedly, we should probably have a better mechanism for selecting the latest version available. --- Android.mk | 2 +- INSTALL.markdown | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index a638c9b..ad742f3 100644 --- a/Android.mk +++ b/Android.mk @@ -44,7 +44,7 @@ apitrace_private_target: cd $(MY_APITRACE_ROOT) && \ cmake \ -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/android.toolchain.cmake \ - -DANDROID_NDK=../../prebuilt/ndk/android-ndk-r8 \ + -DANDROID_NDK=../../prebuilt/ndk/android-ndk-r7 \ -DANDROID_NDK_LAYOUT=LINARO \ -DANDROID_API_LEVEL=9 \ -DANDROID_NO_UNDEFINED=OFF \ diff --git a/INSTALL.markdown b/INSTALL.markdown index ef05aec..225e0dc 100644 --- a/INSTALL.markdown +++ b/INSTALL.markdown @@ -80,7 +80,7 @@ Put Apitrace source tree into `B2GROOT/external/apitrace/` and the `Android.mk` file (`B2GROOT/external/apitrace/Android.mk`) will do the needful to compile and install apitrace appropriately into the system image as part of FirefoxOS build process. It expects a linaro-type of Android NDK to be present in -`../../prebuilt/ndk/android-ndk-r8` (ie `B2GROOT/prebuilt/ndk/android-ndk-r8`). +`../../prebuilt/ndk/android-ndk-r7` (ie `B2GROOT/prebuilt/ndk/android-ndk-r7`). Windows -- 2.45.2