android/build.py: append API level to LLVM triple

This implicitly defines __ANDROID_API__, which means we can drop the "-D__ANDROID_API__=" parameter. This is recommended on https://android.googlesource.com/platform/ndk/+/ndk-release-r20/docs/BuildSystemMaintainers.md

android/build.py: append API level to LLVM triple
2306b0d7 · Max Kellermann · cb1a9045 · 2306b0d7
Commit 2306b0d7 authored Jan 12, 2020 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

build.py android/build.py +2 -3

No files found.
--- a/android/build.py
+++ b/android/build.py
@@ -92,7 +92,7 @@ class AndroidNdkToolchain:

        toolchain_path = os.path.join(ndk_path, 'toolchains', abi_info['toolchain_arch'] + '-' + gcc_version, 'prebuilt', build_arch)
        llvm_path = os.path.join(ndk_path, 'toolchains', 'llvm', 'prebuilt', build_arch)
-        llvm_triple = abi_info['llvm_triple']
+        llvm_triple = abi_info['llvm_triple'] + android_api_level

        common_flags = '-Os -g'
        common_flags += ' -fPIC'
@@ -115,8 +115,7 @@ class AndroidNdkToolchain:
        self.cxxflags = common_flags
        self.cppflags = '--sysroot=' + sysroot + \
            ' -isystem ' + os.path.join(install_prefix, 'include') + \
-            ' -isystem ' + os.path.join(sysroot, 'usr', 'include', arch) + \
-            ' -D__ANDROID_API__=' + android_api_level
+            ' -isystem ' + os.path.join(sysroot, 'usr', 'include', arch)
        self.ldflags = '--sysroot=' + sysroot + \
            ' -L' + os.path.join(install_prefix, 'lib') + \
            ' -L' + os.path.join(target_root, 'usr', 'lib') + \