commit eee113917f28cf327e1e73c64648f21c7b9e9542
author Dan Albert <danalbert@google.com> Mon Sep 21 15:35:34 2020 -0700
committer Dan Albert <danalbert@google.com> Mon Sep 21 15:35:34 2020 -0700
tree 358b616748b46efd3089cf3651903462c95415a5
parent e2d15ee24cab548d1e5a584feac26790e88d329c

Add additional bionic include directory for CRTs.

Test: treehugger
Bug: None
Change-Id: I7235c09e6d0016c689fd9d27c6a3959dea29b136

ndk/checkbuild.py

diff --git a/ndk/checkbuild.py b/ndk/checkbuild.py
index 50c5346..27d5eea 100755
--- a/ndk/checkbuild.py
+++ b/ndk/checkbuild.py
@@ -999,8 +999,8 @@
     def get_build_cmd(self, dst: str, srcs: List[str], api: int,
                       arch: ndk.abis.Arch,
                       build_number: Union[int, str]) -> List[str]:
-        bionic_includes = ndk.paths.android_path(
-            'bionic/libc/arch-common/bionic')
+        libc_includes = ndk.paths.ANDROID_DIR / 'bionic/libc'
+        arch_common_includes = libc_includes / 'arch-common/bionic'
 
         cc = os.path.join(
             self.get_dep('clang').get_build_host_install(), 'bin/clang')
@@ -1014,11 +1014,11 @@
             self.prebuilt_path('sysroot'),
             '-gcc-toolchain',
             binutils,
-            '-I',
-            bionic_includes,
-            '-DPLATFORM_SDK_VERSION={}'.format(api),
-            '-DABI_NDK_VERSION="{}"'.format(ndk.config.release),
-            '-DABI_NDK_BUILD_NUMBER="{}"'.format(build_number),
+            f'-I{libc_includes}',
+            f'-I{arch_common_includes}',
+            f'-DPLATFORM_SDK_VERSION={api}',
+            f'-DABI_NDK_VERSION="{ndk.config.release}"',
+            f'-DABI_NDK_BUILD_NUMBER="{build_number}"',
             '-O2',
             '-fpic',
             '-Wl,-r',