aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-06-23 01:10:09 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-06-23 01:16:37 +0000
commit4af1d1f7c1763bdc8b384cc9f11b8a7c84e63e90 (patch)
tree6d385417a23016534716922963f180392796fb3b
parent5de404eb4dd33c9a62da01beda879e59a4a1a1f0 (diff)
parentcd1aaed4f0c4f0376c35f365d88e966454406e4e (diff)
downloadbuild_make-4af1d1f7c1763bdc8b384cc9f11b8a7c84e63e90.tar.gz
build_make-4af1d1f7c1763bdc8b384cc9f11b8a7c84e63e90.tar.bz2
build_make-4af1d1f7c1763bdc8b384cc9f11b8a7c84e63e90.zip
Make change and version bump to RP1A.200623.001
Change-Id: I2cd86a7579492e1d2c2503c150684b21e4e3902a
-rw-r--r--core/build_id.mk2
-rw-r--r--target/product/gsi_release.mk5
2 files changed, 6 insertions, 1 deletions
diff --git a/core/build_id.mk b/core/build_id.mk
index 2cfedbeb7f..d056206cef 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
-BUILD_ID=RP1A.200622.001
+BUILD_ID=RP1A.200623.001
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 \