aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJooyung Han <jooyung@google.com>2020-06-19 20:09:06 +0900
committerJooyung Han <jooyung@google.com>2020-06-19 20:09:06 +0900
commit15f9085595e37ae7d74645b99c8f233c6e76c52a (patch)
treedda3cd0ee48439e12f182ec05101a98155096e62
parent22f98f1885848fc3ba7afbefbb6f244e7aa90352 (diff)
downloadbuild_make-15f9085595e37ae7d74645b99c8f233c6e76c52a.tar.gz
build_make-15f9085595e37ae7d74645b99c8f233c6e76c52a.tar.bz2
build_make-15f9085595e37ae7d74645b99c8f233c6e76c52a.zip
GSI: install flattened cts shim
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. Bug: 158169437 Bug: 159392784 Test: m com.android.apex.cts.shim.v1_with_prebuilts.flattened # should install the prebuilts of shim APKs Change-Id: I8b37a320d2130d7b33aca856bc067dce37d1fb30
-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 \