From bb45bf9695c76bf16f852f476e9b3bc7045baca8 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Mon, 27 Aug 2018 21:06:42 +0000 Subject: [PATCH] android: NDK17 support tested with NDK 17b (17.1.4828580) --- platforms/android/build_sdk.py | 6 +++++- platforms/android/ndk-17.config.py | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 platforms/android/ndk-17.config.py diff --git a/platforms/android/build_sdk.py b/platforms/android/build_sdk.py index bfd0be79f4..a544f682d2 100755 --- a/platforms/android/build_sdk.py +++ b/platforms/android/build_sdk.py @@ -106,9 +106,13 @@ class ABI: self.cmake_vars = dict( ANDROID_STL="gnustl_static", ANDROID_ABI=self.name, - ANDROID_TOOLCHAIN_NAME=toolchain, ANDROID_PLATFORM_ID=platform_id, ) + if toolchain is not None: + self.cmake_vars['ANDROID_TOOLCHAIN_NAME'] = toolchain + else: + self.cmake_vars['ANDROID_TOOLCHAIN'] = 'clang' + self.cmake_vars['ANDROID_STL'] = 'c++_static' if ndk_api_level: self.cmake_vars['ANDROID_NATIVE_API_LEVEL'] = ndk_api_level self.cmake_vars.update(cmake_vars) diff --git a/platforms/android/ndk-17.config.py b/platforms/android/ndk-17.config.py new file mode 100644 index 0000000000..9a9b5cc3e8 --- /dev/null +++ b/platforms/android/ndk-17.config.py @@ -0,0 +1,6 @@ +ABIs = [ + ABI("2", "armeabi-v7a", None, cmake_vars=dict(ANDROID_ABI='armeabi-v7a with NEON')), + ABI("3", "arm64-v8a", None), + ABI("5", "x86_64", None), + ABI("4", "x86", None), +]