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

Commit 333f7b5f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 765e433d 02426e61

core/board_config.mk

+8 −0
Original line number Diff line number Diff line
@@ -534,6 +534,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)))

target/product/updatable_apex.mk

+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