diff options
| author | Jose Fonseca <jfonseca@vmware.com> | 2015-11-18 14:39:10 +0000 |
|---|---|---|
| committer | Jose Fonseca <jfonseca@vmware.com> | 2015-11-18 14:46:14 +0000 |
| commit | f80d4c8bcb2f5a08015100048b3ae54c0d7999bd (patch) | |
| tree | 869f53978e49c2ec93c80d3af86b293f359ae4be /docs | |
| parent | c5d72ad5be5629eb9b8472ac7fcfa9f40a8bffbd (diff) | |
cmake: Don't bundle android.toolchain.cmake.
No need really. And saves me the trouble of manually merging it every
now and then.
On B2G, use curl to download it. Untested, but curl should always exist per
https://developer.mozilla.org/en-US/docs/Mozilla/Firefox_OS/Firefox_OS_build_prerequisites
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/INSTALL.markdown | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/docs/INSTALL.markdown b/docs/INSTALL.markdown index 6be5f8d1..d0dec538 100644 --- a/docs/INSTALL.markdown +++ b/docs/INSTALL.markdown @@ -73,14 +73,17 @@ Build as: Additional requirements: +* [Android CMake](https://github.com/taka-no-me/android-cmake) * [Android NDK](http://developer.android.com/sdk/ndk/index.html) * [Android SDK](http://developer.android.com/sdk/index.html#Other). **Make sure you have Android 4.4.2 (API 19) platform SDK installed and Android build tools "21.1.2". API 19 is needed only to build the APK, but it will still run on lower API versions (with works starting with API 12).** Build as: + wget -N https://raw.githubusercontent.com/taka-no-me/android-cmake/master/android.toolchain.cmake + cmake \ -H. -Bbuild \ - -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/android.toolchain.cmake \ + -DCMAKE_TOOLCHAIN_FILE=$PWD/android.toolchain.cmake \ -DANDROID_NDK=/path/to/your/ndk \ -DANDROID_API_LEVEL=9 \ -DANDROID_STL=gnustl_shared \ @@ -97,7 +100,7 @@ CMake as: cmake \ -H. -Bbuild \ - -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/android.toolchain.cmake \ + -DCMAKE_TOOLCHAIN_FILE=$PWD/android.toolchain.cmake \ -DANDROID_API_LEVEL=9 \ -DANDROID_TOOLCHAIN_NAME=aarch64-linux-android-4.9 \ -DANDROID_ABI=arm64-v8a |