aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Prichard <rprichard@google.com>2024-04-25 19:18:08 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-04-25 19:18:08 +0000
commitdaabc31fc62d5945f2756727ea7b78bb185a7000 (patch)
tree17dbd69a84050f9b0ea0ba113bb14a4c33864f43
parent73d55fb9fcd9eaf34ae0f0f807e2f4d49b2cf371 (diff)
parenta89238e4166e7a4aa6730bbbf3033f8661a6b222 (diff)
downloadcommon-daabc31fc62d5945f2756727ea7b78bb185a7000.tar.gz
Merge "Switch to libc++ prebuilt" into main
-rw-r--r--build/allowed_deps.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt
index 73df36dd..53fd1153 100644
--- a/build/allowed_deps.txt
+++ b/build/allowed_deps.txt
@@ -523,10 +523,6 @@ libbtcore_headers(minSdkVersion:30)
libbuildversion(minSdkVersion:(no version))
libbuildversion(minSdkVersion:26)
libbytes(minSdkVersion:29)
-libc++(minSdkVersion:apex_inherit)
-libc++_static(minSdkVersion:apex_inherit)
-libc++abi(minSdkVersion:apex_inherit)
-libc++demangle(minSdkVersion:apex_inherit)
libc++fs(minSdkVersion:apex_inherit)
libc_headers(minSdkVersion:apex_inherit)
libc_headers_arch(minSdkVersion:apex_inherit)
@@ -1492,6 +1488,9 @@ prebuilt_kotlinx-coroutines-android-nodeps(minSdkVersion:current)
prebuilt_kotlinx-coroutines-core-nodeps(minSdkVersion:(no version))
prebuilt_kotlinx-coroutines-core-nodeps(minSdkVersion:current)
prebuilt_libasync_safe(minSdkVersion:(no version))
+prebuilt_libc++(minSdkVersion:(no version))
+prebuilt_libc++_static(minSdkVersion:(no version))
+prebuilt_libc++demangle(minSdkVersion:(no version))
prebuilt_libc_headers(minSdkVersion:(no version))
prebuilt_libcap(minSdkVersion:(no version))
prebuilt_libclang_rt.builtins(minSdkVersion:(no version))