commit 8ce995d7e87fb736bada0458cc8dc93fec3c8cdb
author Dan Albert <danalbert@google.com> Wed Apr 27 23:13:13 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 27 23:13:13 2022 +0000
tree 11f80f225109c933642ae179d833e7f9e60811b0
parent 418c0eed2f83d0adb3240cdcb1dda16e9d1ff503
parent ee71351fae66b9f499d2783d332c66b8780c7ba6

Update NDK prebuilts to build 8474149. am: ee71351fae

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ndk/+/17947822

Change-Id: Ib08f7c22a13b6570a6b31f0ff61efc490a8661c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

update.py

diff --git a/update.py b/update.py
index 398a68b..1ca8ba1 100755
--- a/update.py
+++ b/update.py
@@ -96,6 +96,9 @@
     "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 @@
             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 @@
     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