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

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

Merge changes from topic "gsi-with-flattened-apexes" 

* changes:
  Enable updatable-apex.mk for mainline_system
  Add PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES
parents 9088392b 99f5e401

core/main.mk

+4 −3
Original line number Diff line number Diff line
@@ -1186,9 +1186,10 @@ APEX_MODULE_LIBS += \ 
# still may create these libraries in /system (b/129006418).

DISABLE_APEX_LIBS_ABSENCE_CHECK ?=



# Allow APEX libraries under /system/apex, which happens when APEX flattening

# is enabled.

APEX_LIBS_ABSENCE_CHECK_EXCLUDE := apex

# Allow APEX libraries under:

# /system/apex, which happens when APEX flattening is enabled.

# /system/system_ext, which happens with GSI

APEX_LIBS_ABSENCE_CHECK_EXCLUDE := apex system_ext



# Bionic should not be in /system, except for the bootstrap instance.

APEX_LIBS_ABSENCE_CHECK_EXCLUDE += lib/bootstrap lib64/bootstrap

core/product.mk

+2 −0
Original line number Diff line number Diff line
@@ -381,6 +381,8 @@ _product_single_value_vars += PRODUCT_VIRTUAL_AB_OTA_RETROFIT 
# If set, Java module in product partition cannot use hidden APIs.

_product_single_value_vars += PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE



_product_single_value_vars += PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES



.KATI_READONLY := _product_single_value_vars _product_list_vars

_product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars)

core/soong_config.mk

+2 −0
Original line number Diff line number Diff line
@@ -199,6 +199,8 @@ $(call end_json_map) 


$(call add_json_bool, EnforceProductPartitionInterface,  $(PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE))



$(call add_json_bool, InstallExtraFlattenedApexes, $(PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES))



$(call json_end)



$(file >$(SOONG_VARIABLES).tmp,$(json_contents))

target/product/gsi_release.mk

+6 −0
Original line number Diff line number Diff line
@@ -38,6 +38,12 @@ PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true 
# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI

PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true



# GSI targets should install "unflattened" APEXes in /system

TARGET_FLATTEN_APEX := false



# GSI targets should install "flattened" APEXes in /system_ext as well

PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES := true



# GSI specific tasks on boot

PRODUCT_PACKAGES += \

    gsi_skip_mount.cfg \

target/product/mainline_system.mk

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk) 
# Add adb keys to debuggable AOSP builds (if they exist)

$(call inherit-product-if-exists, vendor/google/security/adb/vendor_key.mk)



# Enable updating of APEXes

$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)



# Shared java libs

PRODUCT_PACKAGES += \

    com.android.nfc_extras \