aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaeid Farivar Asanjan <farivar@google.com>2022-12-19 19:06:09 +0000
committerSaeid Farivar Asanjan <farivar@google.com>2023-01-11 22:18:55 +0000
commitec62d6521e76544cb14cc1fa2d5fe5e4fb509dc7 (patch)
tree5cee4939285dc696b9401d912e0bf5aabbc7ff64
parent342ecef2f999a5082dfd797d68ff00c3555bf20b (diff)
downloadcommon-ec62d6521e76544cb14cc1fa2d5fe5e4fb509dc7.tar.gz
Ignore-AOSP-First: merge conflict. see aosp/2364085
Adding a new target to car-ui-lib that doesn't include overlayable.xml Test-Info: N/A Previous-Platform-Support: Yes Aosp-First: Yes Apex-Size-Increase: No Bug: 239735198 Test: N/A Change-Id: I48c8e25bdb0f5613388be9c86ea5eb8b866a81a0 Merged-In: I48c8e25bdb0f5613388be9c86ea5eb8b866a81a0 Merged-In: I7406d638fef78074bac641a04c90fa214da33a76
-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 773367a4..a8d9ff8e 100644
--- a/build/allowed_deps.txt
+++ b/build/allowed_deps.txt
@@ -209,8 +209,10 @@ captiveportal-lib(minSdkVersion:29)
car-rotary-lib(minSdkVersion:28)
car-rotary-lib-resources(minSdkVersion:28)
car-ui-lib(minSdkVersion:28)
+car-ui-lib-overlayable-resources(minSdkVersion:28)
car-ui-lib-resources(minSdkVersion:28)
car-ui-lib-source(minSdkVersion:28)
+car-ui-lib-source-no-overlayable(minSdkVersion:28)
census(minSdkVersion:30)
clatd(minSdkVersion:30)
codecs_g711dec(minSdkVersion:29)