openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge changes from topic "gsi-with-flattened-apexes" am: b3bff1d203 am: 66ee21cedd am: 5feb2e79a3 

Change-Id: I244be08d252e1da0eee055a451d748cf0cabca87
This commit is contained in:
Automerger Merge Worker 2019-12-13 22:13:49 +00:00
parent 7fdf27e437 5feb2e79a3
commit edf413c451
5 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/main.mk
View File

@ -1185,9 +1185,10 @@ APEX_MODULE_LIBS += \
# still may create these libraries in /system (b/129006418). # still may create these libraries in /system (b/129006418).
DISABLE_APEX_LIBS_ABSENCE_CHECK ?= DISABLE_APEX_LIBS_ABSENCE_CHECK ?=
# Allow APEX libraries under /system/apex, which happens when APEX flattening # Allow APEX libraries under:
# is enabled. # /system/apex, which happens when APEX flattening is enabled.
APEX_LIBS_ABSENCE_CHECK_EXCLUDE := apex # /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. # Bionic should not be in /system, except for the bootstrap instance.
APEX_LIBS_ABSENCE_CHECK_EXCLUDE += lib/bootstrap lib64/bootstrap APEX_LIBS_ABSENCE_CHECK_EXCLUDE += lib/bootstrap lib64/bootstrap

2
core/product.mk
View File

@ -381,6 +381,8 @@ _product_single_value_vars += PRODUCT_VIRTUAL_AB_OTA_RETROFIT
# If set, Java module in product partition cannot use hidden APIs. # 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_ENFORCE_PRODUCT_PARTITION_INTERFACE
_product_single_value_vars += PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES
.KATI_READONLY := _product_single_value_vars _product_list_vars .KATI_READONLY := _product_single_value_vars _product_list_vars
_product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars) _product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars)

2
core/soong_config.mk
View File

@ -199,6 +199,8 @@ $(call end_json_map)
$(call add_json_bool, EnforceProductPartitionInterface, $(PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE)) $(call add_json_bool, EnforceProductPartitionInterface, $(PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE))
$(call add_json_bool, InstallExtraFlattenedApexes, $(PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES))
$(call json_end) $(call json_end)
$(file >$(SOONG_VARIABLES).tmp,$(json_contents)) $(file >$(SOONG_VARIABLES).tmp,$(json_contents))

6
target/product/gsi_release.mk
View File

@ -38,6 +38,12 @@ PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI # Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI
PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true 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 # GSI specific tasks on boot
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
gsi_skip_mount.cfg \ gsi_skip_mount.cfg \

3
target/product/mainline_system.mk
View File

@ -21,6 +21,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)
# Add adb keys to debuggable AOSP builds (if they exist) # Add adb keys to debuggable AOSP builds (if they exist)
$(call inherit-product-if-exists, vendor/google/security/adb/vendor_key.mk) $(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 # Shared java libs
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
com.android.nfc_extras \ com.android.nfc_extras \