diff options
| author | David Benjamin <davidben@google.com> | 2022-12-03 18:04:07 -0500 |
|---|---|---|
| committer | Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-12-08 21:32:57 +0000 |
| commit | c3197fc35b8c9ec2974e891e65d13abff5da4216 (patch) | |
| tree | efabf441806e56c658cb1c7c6947a57a60f0d289 /CMakeLists.txt | |
| parent | cdccbe121fa5dc8c6df7102eaedb62c99eec8273 (diff) | |
| download | boringssl-c3197fc35b8c9ec2974e891e65d13abff5da4216.zip boringssl-c3197fc35b8c9ec2974e891e65d13abff5da4216.tar.gz boringssl-c3197fc35b8c9ec2974e891e65d13abff5da4216.tar.bz2 | |
Drop the workaround for the third-party Android CMake toolchain.
When we first added Android support to the CMake build, we used a
third-party toolchain file, https://github.com/taka-no-me/android-cmake.
That project hasn't been updated since 2015 and, among other things,
doesn't support Armv8.
In 2017, we replaced it with the NDK's build-in toolchain file, which no
longer needed a particular workaround for ASM flags. See
https://boringssl-review.googlesource.com/c/boringssl/+/24165 and
https://boringssl-review.googlesource.com/c/boringssl/+/24164
Drop this workaround now.
Change-Id: I4af78d641b0c9b9608aaaa5ca31b9e80de024ab2
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/55627
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e643ece..1ebba93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -513,13 +513,6 @@ else() message(FATAL_ERROR "Unknown processor:" ${CMAKE_SYSTEM_PROCESSOR}) endif() -if(ANDROID AND NOT ANDROID_NDK_REVISION AND ARCH STREQUAL "arm") - # The third-party Android-NDK CMake files somehow fail to set the -march flag - # for assembly files. Without this flag, the compiler believes that it's - # building for ARMv5. - set(CMAKE_ASM_FLAGS "-march=${CMAKE_SYSTEM_PROCESSOR} ${CMAKE_ASM_FLAGS}") -endif() - if(USE_CUSTOM_LIBCXX) if(NOT CLANG) message(FATAL_ERROR "USE_CUSTOM_LIBCXX only supported with Clang") |