diff options
| author | Dan Albert <danalbert@google.com> | 2017-02-16 15:58:16 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2017-06-05 13:21:20 -0700 |
| commit | 4a9f58b2acbdf5b8932c377ea21db92a2cbfe618 (patch) | |
| tree | d9d1c4bcce2e02bd150cfecd789300bab35608d7 /sources | |
| parent | 6938b861637752f9f9f313f8e7e280eb52bc8f28 (diff) | |
| download | ndk-4a9f58b2acbdf5b8932c377ea21db92a2cbfe618.tar.gz | |
Build libc++ with unified headers.
Add another configuration option to ndk-build so we can use the
unified headers in prebuilts/ndk, and pass that option to the libc++
build.
Test: ./checkbuild.py --libc++ && ./validate.py
Bug: None
Change-Id: Ie835809f3de3e48f7c35e078b6c7c617069e4448
Diffstat (limited to 'sources')
| -rwxr-xr-x | sources/cxx-stl/llvm-libc++/build.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sources/cxx-stl/llvm-libc++/build.py b/sources/cxx-stl/llvm-libc++/build.py index 587baf899..cd60c026d 100755 --- a/sources/cxx-stl/llvm-libc++/build.py +++ b/sources/cxx-stl/llvm-libc++/build.py @@ -52,9 +52,11 @@ def main(args): abis.extend(build_support.arch_to_abis(arch)) ndk_build = build_support.ndk_path('build/ndk-build') - prebuilt_ndk = build_support.android_path('prebuilts/ndk/current') - platforms_root = os.path.join(prebuilt_ndk, 'platforms') - toolchains_root = os.path.join(prebuilt_ndk, 'toolchains') + 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') + toolchains_root = os.path.join(prebuilt_ndk, 'current/toolchains') libcxx_path = build_support.android_path('external/libcxx') obj_out = os.path.join(args.out_dir, 'libcxx/obj') @@ -70,6 +72,7 @@ def main(args): 'APP_ABI=' + ' '.join(abis), # Use the prebuilt platforms and toolchains. + 'NDK_UNIFIED_SYSROOT_PATH=' + unified_sysroot_path, 'NDK_PLATFORMS_ROOT=' + platforms_root, 'NDK_TOOLCHAINS_ROOT=' + toolchains_root, 'NDK_NEW_TOOLCHAINS_LAYOUT=true', |