diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:13:13 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:13:13 +0000 |
commit | 6d4e9f85a729c71f69dfd5e9b089510c2ae49317 (patch) | |
tree | 958ad591bf6b4640e0fdb2327356a404e85df0cd | |
parent | b0612a3b557da8563306a516e7306e63f1db4dbb (diff) | |
parent | ac44779175095b5fe4812374ad3f71f8d17b6b9d (diff) | |
download | ndk-aml_sta_341114000.tar.gz |
Snap for 10453563 from ac44779175095b5fe4812374ad3f71f8d17b6b9d to mainline-os-statsd-releaseaml_sta_341710000aml_sta_341615000aml_sta_341511040aml_sta_341410000aml_sta_341311010aml_sta_341114000aml_sta_341111000aml_sta_341010020aml_sta_340912000aml_sta_340911000aml_net_341111030android14-mainline-os-statsd-release
Change-Id: Ib9b82db73edb5a13cca32b43c6bae7b19ac98113
-rwxr-xr-x | update.py | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -96,6 +96,9 @@ LIBCXX_STATIC_GLOB = ( "toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/*/libc++_static.a" ) LIBCXXABI_GLOB = "toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/*/libc++abi.a" +LIBANDROID_SUPPORT_GLOB = ( + "toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/*/libandroid_support.a" +) def unzip_single_directory(artifact: Path, destination: Path) -> None: @@ -116,6 +119,7 @@ def unzip_single_directory(artifact: Path, destination: Path) -> None: os.path.join("*", LIBCXX_SHARED_GLOB), os.path.join("*", LIBCXX_STATIC_GLOB), os.path.join("*", LIBCXXABI_GLOB), + os.path.join("*", LIBANDROID_SUPPORT_GLOB), ] check_call(cmd) @@ -135,7 +139,12 @@ def relocate_libcxx(install_dir: Path) -> None: directory should be dead soon we'll just fix-up the install for now. """ dest_base = install_dir / "sources/cxx-stl/llvm-libc++/libs" - for glob in {LIBCXX_SHARED_GLOB, LIBCXX_STATIC_GLOB, LIBCXXABI_GLOB}: + for glob in { + LIBCXX_SHARED_GLOB, + LIBCXX_STATIC_GLOB, + LIBCXXABI_GLOB, + LIBANDROID_SUPPORT_GLOB, + }: file_name = Path(glob).name for file_path in install_dir.glob(glob): triple = file_path.parent.name |