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

Commit 1dbb0c3d authored by Roland Levillain's avatar Roland Levillain Committed by Jiyong Park
Browse files

Introduce build variable `OVERRIDE_TARGET_FLATTEN_APEX`. 

When `OVERRIDE_TARGET_FLATTEN_APEX` is defined (e.g. set in the
environment), `TARGET_FLATTEN_APEX` is forcibly assigned its value.

This is useful to enable/disable APEX flattening from the command
line (thus ignoring the product's default configuration), for testing
purposes.

Note: Previously it was possible to set `TARGET_FLATTEN_APEX` directly
and have the same effect, but recent changes in the build
configuration now prevent that option.

Test: Check that:
        export OVERRIDE_TARGET_FLATTEN_APEX=true \
          && . ./build/envsetup.sh \
          && lunch aosp_walleye-userdebug \
          && export OVERRIDE_TARGET_FLATTEN_APEX=true \
          && build/soong/soong_ui.bash --dumpvar-mode TARGET_FLATTEN_APEX
      returns:
        true
Bug: 121117762

Merged-In: Ib9ccae38430340de38e4758b4f55df2c65ea60d5
Change-Id: Ib9ccae38430340de38e4758b4f55df2c65ea60d5
(cherry picked from commit b3a503df)
parent 4a475b47

core/board_config.mk

+10 −2
Original line number Diff line number Diff line
@@ -508,9 +508,17 @@ endif 
# APEXes are by default flattened, i.e. non-updatable.

# It can be unflattened (and updatable) by inheriting from

# updatable_apex.mk

#

# APEX flattening can also be forcibly enabled (resp. disabled) by

# setting OVERRIDE_TARGET_FLATTEN_APEX to true (resp. false), e.g. by

# setting the OVERRIDE_TARGET_FLATTEN_APEX environment variable.

ifdef OVERRIDE_TARGET_FLATTEN_APEX

  TARGET_FLATTEN_APEX := $(OVERRIDE_TARGET_FLATTEN_APEX)

else

  ifeq (,$(TARGET_FLATTEN_APEX))

    TARGET_FLATTEN_APEX := true

  endif

endif



ifeq (,$(TARGET_BUILD_APPS))

ifdef PRODUCT_EXTRA_VNDK_VERSIONS

target/product/updatable_apex.mk

+5 −3
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


# Inherit this when the target needs to support updating APEXes



PRODUCT_PROPERTY_OVERRIDES := ro.apex.updatable=true

ifneq ($(OVERRIDE_TARGET_FLATTEN_APEX),true)

  PRODUCT_PACKAGES := com.android.apex.cts.shim.v1_prebuilt

  PRODUCT_PROPERTY_OVERRIDES := ro.apex.updatable=true

  TARGET_FLATTEN_APEX := false

endif