Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b32675fe authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Ensure TARGET_FLATTEN_APEX == true when ro.apex.updatable is not set am: 18411a42

am: b233b2bb

Change-Id: I189fc89fda6546f305a187973cdae6e4586435a7
parents 412d99bc b233b2bb
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -509,6 +509,14 @@ else
  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)))
+1 −0
Original line number Diff line number Diff line
@@ -18,3 +18,4 @@

PRODUCT_PROPERTY_OVERRIDES := ro.apex.updatable=true
PRODUCT_PACKAGES := com.android.apex.cts.shim.v1_prebuilt
TARGET_FLATTEN_APEX := false