Use the just-built sysroot for building libc++.

The libc++ headers now make use of <android/ndk-version.h>, which is
generated as part of our build rather than as a part of the platform
prebuilts.

Test: ./checkbuild.py && ./run_tests.py
Bug: None
Change-Id: Idf434e396af0ed3d3131007480fba24ded85e0ab

1 files changed, 4 insertions, 3 deletions

diff --git a/checkbuild.py b/checkbuild.py
index e72fdf89c..de059e42f 100755
--- a/checkbuild.py
+++ b/checkbuild.py
@@ -707,6 +707,8 @@ class Libcxx(ndk.builds.Module):
         'libandroid_support',
         'ndk-build',
         'ndk-build-shortcut',
+        'platforms',
+        'sysroot',
     }
 
     def __init__(self):
@@ -735,9 +737,8 @@ class Libcxx(ndk.builds.Module):
         application_mk = os.path.join(self.libcxx_path, 'Application.mk')
 
         prebuilt_ndk = build_support.android_path('prebuilts/ndk')
-        platform_prebuilts = os.path.join(prebuilt_ndk, 'platform')
-        platforms_root = os.path.join(prebuilt_ndk, 'current/platforms')
-        unified_sysroot_path = os.path.join(platform_prebuilts, 'sysroot')
+        platforms_root = os.path.join(ndk_path, 'platforms')
+        unified_sysroot_path = os.path.join(ndk_path, 'sysroot')
         toolchains_root = os.path.join(prebuilt_ndk, 'current/toolchains')
 
         build_cmd = [