diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-06-23 01:06:30 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-06-23 01:06:30 +0000 |
| commit | c6ac7159b643b8ec2ff433cffb9bf0549fdb2630 (patch) | |
| tree | c6293cd124db9a030a0ef4ddcc4fc02654e9f915 | |
| parent | eee2d801f22b029509a4f479e417ab135986761b (diff) | |
| parent | 761f86e9624ebb692118a8dfdc6de60e3e8caf35 (diff) | |
| download | apex-c6ac7159b643b8ec2ff433cffb9bf0549fdb2630.tar.gz | |
Snap for 6617722 from 761f86e9624ebb692118a8dfdc6de60e3e8caf35 to rvc-d1-release
Change-Id: Ic28e91eab12c2f4293cf620e30075cd5bfefb6d3
| -rw-r--r-- | shim/build/Android.bp | 14 | ||||
| -rw-r--r-- | shim/build/prebuilts_shim_allowed_list.txt | 4 |
2 files changed, 18 insertions, 0 deletions
diff --git a/shim/build/Android.bp b/shim/build/Android.bp index b8deb8f0..2667984b 100644 --- a/shim/build/Android.bp +++ b/shim/build/Android.bp @@ -238,6 +238,20 @@ apex { allowed_files: "default_shim_allowed_list.txt", } +// This is to install the flattened version of com.android.apex.cts.shim. +// Because com.android.apex.cts.shim is provided as prebuilt and the build system +// doesn't support install "flattened" version from "prebult" yet, GSI, which should +// have both "flatttened" and "unflattened" APEXes, is missing the flattened version +// of com.android.apex.cts.shim. +// TODO(b/159426728): When the build system can install "flattened" from "prebuilts", +// this can be removed. +override_apex { + name: "com.android.apex.cts.shim.v1_with_prebuilts", + base: "com.android.apex.cts.shim.v1", + apps: ["CtsShimPrebuilt", "CtsShimPrivPrebuilt"], + allowed_files: "prebuilts_shim_allowed_list.txt", +} + genrule { name: "com.android.apex.cts.shim_not_pre_installed.pem", out: ["com.android.apex.cts.shim_not_pre_installed.pem"], diff --git a/shim/build/prebuilts_shim_allowed_list.txt b/shim/build/prebuilts_shim_allowed_list.txt new file mode 100644 index 00000000..7da513ff --- /dev/null +++ b/shim/build/prebuilts_shim_allowed_list.txt @@ -0,0 +1,4 @@ +./apex_manifest.pb +./app/CtsShimPrebuilt/CtsShimPrebuilt.apk +./etc/hash.txt +./priv-app/CtsShimPrivPrebuilt/CtsShimPrivPrebuilt.apk |