diff options
| author | Ryan Prichard <rprichard@google.com> | 2024-04-26 01:52:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-26 01:52:16 +0000 |
| commit | 90b7726ca1f9bf64309bda34dfb7c64f96fce95f (patch) | |
| tree | 9ed4a4ac9640c50f17855a3ae8bb670f3db4902b | |
| parent | daabc31fc62d5945f2756727ea7b78bb185a7000 (diff) | |
| parent | c978d8fa030440409bf9231c624c8a683499f86e (diff) | |
| download | common-90b7726ca1f9bf64309bda34dfb7c64f96fce95f.tar.gz | |
Merge "Revert "Switch to libc++ prebuilt"" into main
| -rw-r--r-- | build/allowed_deps.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt index 53fd1153..73df36dd 100644 --- a/build/allowed_deps.txt +++ b/build/allowed_deps.txt @@ -523,6 +523,10 @@ 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) @@ -1488,9 +1492,6 @@ 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)) |