commit 333f7b5fcc356e6887234308656e95161aa27f4e
author Treehugger Robot <treehugger-gerrit@google.com> Thu May 09 08:48:05 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 09 08:48:05 2019 +0000
tree 3117b2896747c12f0fbad42bea95ba427f6a3d8d
parent 765e433d24da96fc181b003c06612cb64e235b27
parent 02426e61186a95b3cdc63bd3b7f4884f20ba9f24

Merge "Ensure TARGET_FLATTEN_APEX == true when ro.apex.updatable is not set"

core/board_config.mk

diff --git a/core/board_config.mk b/core/board_config.mk
index 62d779c..597b10e 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -534,6 +534,14 @@
   TARGET_VENDOR_TEST_SUFFIX :=
 endif
 
+###########################################
+# APEXes are by default flattened, i.e. non-updatable.
+# It can be unflattened (and updatable) by inheriting from
+# updatable_apex.mk
+ifeq (,$(TARGET_FLATTEN_APEX))
+TARGET_FLATTEN_APEX := true
+endif
+
 ifeq (,$(TARGET_BUILD_APPS))
 ifdef PRODUCT_EXTRA_VNDK_VERSIONS
   $(foreach v,$(PRODUCT_EXTRA_VNDK_VERSIONS),$(call check_vndk_version,$(v)))

target/product/updatable_apex.mk

diff --git a/target/product/updatable_apex.mk b/target/product/updatable_apex.mk
index 4b31578..038f66e 100644
--- a/target/product/updatable_apex.mk
+++ b/target/product/updatable_apex.mk
@@ -18,3 +18,4 @@
 
 PRODUCT_PROPERTY_OVERRIDES := ro.apex.updatable=true
 PRODUCT_PACKAGES := com.android.apex.cts.shim.v1_prebuilt
+TARGET_FLATTEN_APEX := false