From 3fae47d1e88d9ed57da7a29933f1ccba80a83832 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Thu, 21 Jun 2018 11:27:34 -0700 Subject: Use the just-built sysroot for building libc++. The libc++ headers now make use of , 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 --- checkbuild.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'checkbuild.py') 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 = [ -- cgit v1.2.3