diff options
| author | Alexander Dorokhine <adorokhine@google.com> | 2020-02-20 12:36:32 -0800 |
|---|---|---|
| committer | Alexander Dorokhine <adorokhine@google.com> | 2020-02-20 12:42:10 -0800 |
| commit | 0462c2d1927fb299d29010aee3e24c31fec67033 (patch) | |
| tree | 4ba40ed860241426a1962fb936933e91e9efbf04 /share/cmake-3.10/Modules/Platform/Android/abi-arm64-v8a-GNU.cmake | |
| parent | b684615c4e3b6a80e50026260746a43e6660a6bb (diff) | |
| parent | 56ef56b3c52c03ad5680d505146183e49884dc03 (diff) | |
| download | windows-x86-0462c2d1927fb299d29010aee3e24c31fec67033.tar.gz | |
Merge remote-tracking branch 'origin/cmake-master-dev' into master
* origin/cmake-master-dev:
Upgrade cmake to 3.10.2
Remove file I added earlier to trigger a build.
Test CL
Add executable bit
Switch to 32-bit cmake
Update cmake (ab/4111459)
Add cmake 3.8.2 for tests
Update prebuilts to CMake 3.6.0-rc2 (go/ab/3043163).
Adding binaries for 3.2.3_vs2013
Bug: 149853706
Change-Id: Ifc4558efd71baa39ef08ecdb0f908697623bdd36
Diffstat (limited to 'share/cmake-3.10/Modules/Platform/Android/abi-arm64-v8a-GNU.cmake')
| -rwxr-xr-x | share/cmake-3.10/Modules/Platform/Android/abi-arm64-v8a-GNU.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/share/cmake-3.10/Modules/Platform/Android/abi-arm64-v8a-GNU.cmake b/share/cmake-3.10/Modules/Platform/Android/abi-arm64-v8a-GNU.cmake new file mode 100755 index 0000000..b71a674 --- /dev/null +++ b/share/cmake-3.10/Modules/Platform/Android/abi-arm64-v8a-GNU.cmake @@ -0,0 +1,6 @@ +# <ndk>/build/core/toolchains/aarch64-linux-android-4.9/setup.mk + +# Suppress -Wl,-z,nocopyreloc flag on arm64-v8a +set(_ANDROID_ABI_INIT_EXE_LDFLAGS_NO_nocopyreloc 1) + +include(Platform/Android/abi-common-GNU) |