Snap for 10428683 from ac44779175095b5fe4812374ad3f71f8d17b6b9d to mainline-adbd-releaseaml_adb_341520010aml_adb_341517070aml_adb_340912530aml_adb_340912350aml_adb_340912200aml_adb_340912000android14-mainline-adbd-release

Change-Id: Ifa5d83226839b4c817d318c0bf243f469513a23f

1 files changed, 10 insertions, 1 deletions

diff --git a/update.py b/update.py
index 398a68b27..1ca8ba145 100755
--- a/update.py
+++ b/update.py
@@ -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