aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJooyung Han <jooyung@google.com>2020-06-22 17:05:58 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-22 17:05:58 +0000
commitcd1aaed4f0c4f0376c35f365d88e966454406e4e (patch)
tree7f6f526ef5481574e8a8d70e891b26f3e1a8ca56
parent99e317ce2dfe1817dd72ed3ac89991d419e125af (diff)
parent15f9085595e37ae7d74645b99c8f233c6e76c52a (diff)
downloadbuild-cd1aaed4f0c4f0376c35f365d88e966454406e4e.tar.gz
Merge "GSI: install flattened cts shim" into rvc-dev
-rw-r--r--target/product/gsi_release.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk
index d786177fb1..d3521fc944 100644
--- a/target/product/gsi_release.mk
+++ b/target/product/gsi_release.mk
@@ -44,6 +44,11 @@ TARGET_FLATTEN_APEX := false
# GSI targets should install "flattened" APEXes in /system_ext as well
PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES := true
+# The flattened version of com.android.apex.cts.shim.v1 should be explicitly installed
+# because the shim apex is prebuilt one and PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES is not
+# supported for prebuilt_apex modules yet.
+PRODUCT_PACKAGES += com.android.apex.cts.shim.v1_with_prebuilts.flattened
+
# GSI specific tasks on boot
PRODUCT_PACKAGES += \
gsi_skip_mount.cfg \