commit b380a209810f50c6bb72aadb83e7d8a2446b2c98
author Christopher Parsons <cparsons@google.com> Wed Nov 18 17:28:18 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 18 17:28:18 2020 +0000
tree 5355e77d0edf0e48bc09cf08b166bfa0122546df
parent 4859112a8c32cc23b148f7162fe00f286c2e2ddd
parent 8d970059f36e0ab8e0ce7b334aa6ddabd4b7c1c5

Merge "Use packagepath and local_repository for mixed builds" am: 2bb2017a30 am: 3c23e6e41f am: 8d970059f3

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1502095

Change-Id: Ie9830b3f4fc1d422f52c28579814a3fe629c6161

apex/allowed_deps.txt

diff --git a/apex/allowed_deps.txt b/apex/allowed_deps.txt
index b350bd0..a88b6b5 100644
--- a/apex/allowed_deps.txt
+++ b/apex/allowed_deps.txt
@@ -132,6 +132,7 @@
 brotli-java(minSdkVersion:current)
 captiveportal-lib(minSdkVersion:29)
 car-ui-lib(minSdkVersion:28)
+car-ui-lib-overlayable(minSdkVersion:28)
 CellBroadcastApp(minSdkVersion:29)
 CellBroadcastServiceModule(minSdkVersion:29)
 codecs_g711dec(minSdkVersion:29)
@@ -325,6 +326,7 @@
 libmedia_headers(minSdkVersion:29)
 libmedia_helper_headers(minSdkVersion:29)
 libmedia_midiiowrapper(minSdkVersion:29)
+libmediaparser-jni(minSdkVersion:29)
 libmidiextractor(minSdkVersion:29)
 libminijail(minSdkVersion:29)
 libminijail_gen_constants(minSdkVersion:(no version))