diff options
author | Adam Langley <agl@google.com> | 2015-04-29 03:46:58 +0300 |
---|---|---|
committer | Adam Langley <agl@google.com> | 2015-05-05 03:31:46 +0300 |
commit | 843ab66e17abd347546480df77b5140c5b7f50bd (patch) | |
tree | a58bb22a6571929c047643bc3c712fdeb1f7aba9 /util | |
parent | f868409124747fba1b3ec070c0a5a7821cdb4649 (diff) |
Add support for building with the Android NDK.
Previously I've been using the Linaro toolchains and just building
static binaries. However, the Linaro toolchains have a broken
pthread_rwlock_wrlock—it does nothing and then unlocking corrupts the
lock.
Building with the Android NDK avoids this.
These build instructions depend on
https://github.com/taka-no-me/android-cmake which people will need to
clone into util/ if they want to use the Android NDK.
Change-Id: Ic64919f9399af2a57e8df4fb4b3400865ddb2427
Reviewed-on: https://boringssl-review.googlesource.com/4600
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'util')
-rw-r--r-- | util/aarch64-toolchain.cmake | 6 | ||||
-rw-r--r-- | util/arm-toolchain.cmake | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/util/aarch64-toolchain.cmake b/util/aarch64-toolchain.cmake deleted file mode 100644 index 77f33ab9..00000000 --- a/util/aarch64-toolchain.cmake +++ /dev/null @@ -1,6 +0,0 @@ -set(CMAKE_SYSTEM_NAME Linux) -set(CMAKE_SYSTEM_VERSION 1) -set(CMAKE_SYSTEM_PROCESSOR "aarch64") -set(CMAKE_CXX_COMPILER "/opt/gcc-linaro-4.9-2014.11-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-g++") -set(CMAKE_C_COMPILER "/opt/gcc-linaro-4.9-2014.11-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc") -set(CMAKE_EXE_LINKER_FLAGS "-static") diff --git a/util/arm-toolchain.cmake b/util/arm-toolchain.cmake deleted file mode 100644 index 2dfd2bd8..00000000 --- a/util/arm-toolchain.cmake +++ /dev/null @@ -1,6 +0,0 @@ -set(CMAKE_SYSTEM_NAME Linux) -set(CMAKE_SYSTEM_VERSION 1) -set(CMAKE_SYSTEM_PROCESSOR "arm") -set(CMAKE_CXX_COMPILER "/opt/gcc-linaro-4.9-2014.11-x86_64_arm-linux-gnueabihf/bin/arm-linux-gnueabihf-g++") -set(CMAKE_C_COMPILER "/opt/gcc-linaro-4.9-2014.11-x86_64_arm-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc") -set(CMAKE_EXE_LINKER_FLAGS "-static") |