| commit | 6c4cdb0bb25c7f8b18c85e24bd259548430f52b9 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Nov 18 23:17:21 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 18 23:17:21 2020 +0000 |
| tree | e1a3c49ec517e0eeef6f84214ac6fd030acf5a1b | |
| parent | 3c70376e415617b758a383e76fec030ac7f4c70a [diff] | |
| parent | a088bff7233b9a6dfa652f7a1351f26e10a52407 [diff] |
Merge changes Iba57c949,Ief43ff51,Ib1809a4d,I2ab64f36 am: b08a091502 am: 3f57de54b2 am: a088bff723 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1480605 Change-Id: If742998ff050c42cc670f274e4c560128db3dcbc
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))