aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaeid Farivar Asanjan <farivar@google.com>2022-07-13 00:16:11 +0000
committerSaeid Farivar Asanjan <farivar@google.com>2022-07-18 17:46:42 +0000
commit4afd1d7e43c06130a08e67c12b380add6238344e (patch)
treeee4ee0d601ee93144ca6d93003dbdf268caaa32b
parent625bf2ea52fafe4adf5d0a718932f79a94b3dfa4 (diff)
downloadcommon-4afd1d7e43c06130a08e67c12b380add6238344e.tar.gz
Ignore-AOSP-First: merge conflict. see aosp/2151709
Add car-ui-lib-source to apex allowed_deps Apex-Size-Increase: `car-ui-lib` which is already present in `allowed_deps.txt` is now renamed to `car-ui-lib-source` on `car-apps-dev` branch. `car-ui-lib` is pointing to the prebuilt on all branches except `car-apps-dev` and `car-ui-lib-source` is poining to the source code only on `car-apps-dev`. Previous-Platform-Support: Yes Aosp-First: No Test-Info: atest CarUILibUnitTest Bug: 238806985 Test: N/A Change-Id: I244620dc377512acd941d75e68ef15ccf12192c1 Merged-In: I244620dc377512acd941d75e68ef15ccf12192c1
-rw-r--r--build/allowed_deps.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt
index 57afbb6a..773367a4 100644
--- a/build/allowed_deps.txt
+++ b/build/allowed_deps.txt
@@ -210,6 +210,7 @@ car-rotary-lib(minSdkVersion:28)
car-rotary-lib-resources(minSdkVersion:28)
car-ui-lib(minSdkVersion:28)
car-ui-lib-resources(minSdkVersion:28)
+car-ui-lib-source(minSdkVersion:28)
census(minSdkVersion:30)
clatd(minSdkVersion:30)
codecs_g711dec(minSdkVersion:29)
@@ -965,6 +966,7 @@ prebuilt_asm-tree-7.0(minSdkVersion:current)
prebuilt_asm-tree-9.2(minSdkVersion:current)
prebuilt_bionic_libc_platform_headers(minSdkVersion:(no version))
prebuilt_car-ui-lib-nodeps(minSdkVersion:28)
+prebuilt_car-ui-lib-source(minSdkVersion:28)
prebuilt_com.google.android.material_material-nodeps(minSdkVersion:(no version))
prebuilt_com.google.android.material_material-nodeps(minSdkVersion:14)
prebuilt_crtbegin_dynamic(minSdkVersion:(no version))