From 4322d3024817ada3b98ad6ca38ec2e65fb6debf2 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Wed, 10 Nov 2021 10:58:40 +0000 Subject: [PATCH] Add back symbolic "S" versions for the ART exported libs. They were removed in https://r.android.com/1876200 but are still required in sc-mainline-prod because ART (and https://r.android.com/1875690 specifically) doesn't merge in there. Test: vendor/google/build/mainline_modules_sdks.sh on sc-mainline-prod Bug: 205748626 Bug: 204364566 Change-Id: I9a987a3f52a173746f0d21acfdd0074f166dc53d --- build/allowed_deps.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt index 20a3a3c..ce83b04 100644 --- a/build/allowed_deps.txt +++ b/build/allowed_deps.txt @@ -347,7 +347,9 @@ libcutils(minSdkVersion:29) libcutils_headers(minSdkVersion:29) libcutils_sockets(minSdkVersion:29) libdexfile_external_headers(minSdkVersion:31) +libdexfile_external_headers(minSdkVersion:S) libdexfile_support(minSdkVersion:31) +libdexfile_support(minSdkVersion:S) libdiagnose_usb(minSdkVersion:(no version)) libdmabufheap(minSdkVersion:29) libdmabufinfo(minSdkVersion:S) @@ -439,10 +441,12 @@ libmpeg2dec(minSdkVersion:29) libnanohttpd(minSdkVersion:30) libnativebase_headers(minSdkVersion:29) libnativebridge-headers(minSdkVersion:31) +libnativebridge-headers(minSdkVersion:S) libnativehelper_compat_libc++(minSdkVersion:(no version)) libnativehelper_compat_libc++(minSdkVersion:29) libnativehelper_header_only(minSdkVersion:29) libnativeloader-headers(minSdkVersion:31) +libnativeloader-headers(minSdkVersion:S) libnativewindow_headers(minSdkVersion:29) libnetdbinder_utils_headers(minSdkVersion:29) libnetdutils(minSdkVersion:29) @@ -455,6 +459,7 @@ libnum_cpus(minSdkVersion:(no version)) liboggextractor(minSdkVersion:29) libonce_cell(minSdkVersion:(no version)) libopenjdkjvmti_headers(minSdkVersion:31) +libopenjdkjvmti_headers(minSdkVersion:S) libopus(minSdkVersion:29) libpanic_abort.rust_sysroot(minSdkVersion:(no version)) libpercent_encoding(minSdkVersion:(no version))