StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES

Browse Source 
We will deprecate flattened apexes. In this change, GSI-specific make
variable (PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES) is removed. The
variable was used to install both image/flattened apexes in the GSI, so
that it works on ro.apex.updatable devices and not-updatable devices.

Now, GSI will have only image APEXes in it.

Bug: 278826656
Test: lunch gsi_arm64-userdebug && m # no flattened apexes
Change-Id: I4702973d4ee75aa693e4e7f4e57577b77059dc09
This commit is contained in:
Jooyung Han
2023-06-20 14:27:10 +09:00
parent 57c1aa7b16
commit 8cc42f429f
3 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/product.mk
View File

@@ -378,8 +378,6 @@ _product_single_value_vars += PRODUCT_ENFORCE_INTER_PARTITION_JAVA_SDK_LIBRARY
# a java_sdk_library module. # a java_sdk_library module.
_product_list_vars += PRODUCT_INTER_PARTITION_JAVA_LIBRARY_ALLOWLIST _product_list_vars += PRODUCT_INTER_PARTITION_JAVA_LIBRARY_ALLOWLIST
_product_single_value_vars += PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES
# Install a copy of the debug policy to the system_ext partition, and allow # Install a copy of the debug policy to the system_ext partition, and allow
# init-second-stage to load debug policy from system_ext. # init-second-stage to load debug policy from system_ext.
# This option is only meant to be set by compliance GSI targets. # This option is only meant to be set by compliance GSI targets.

2
core/soong_config.mk
View File

@@ -265,8 +265,6 @@ $(call add_json_str, DeviceCurrentApiLevelForVendorModules, $(BOARD_CURRENT_AP
$(call add_json_bool, EnforceInterPartitionJavaSdkLibrary, $(filter true,$(PRODUCT_ENFORCE_INTER_PARTITION_JAVA_SDK_LIBRARY))) $(call add_json_bool, EnforceInterPartitionJavaSdkLibrary, $(filter true,$(PRODUCT_ENFORCE_INTER_PARTITION_JAVA_SDK_LIBRARY)))
$(call add_json_list, InterPartitionJavaLibraryAllowList, $(PRODUCT_INTER_PARTITION_JAVA_LIBRARY_ALLOWLIST)) $(call add_json_list, InterPartitionJavaLibraryAllowList, $(PRODUCT_INTER_PARTITION_JAVA_LIBRARY_ALLOWLIST))
$(call add_json_bool, InstallExtraFlattenedApexes, $(PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES))
$(call add_json_bool, CompressedApex, $(filter true,$(PRODUCT_COMPRESSED_APEX))) $(call add_json_bool, CompressedApex, $(filter true,$(PRODUCT_COMPRESSED_APEX)))
ifndef APEX_BUILD_FOR_PRE_S_DEVICES ifndef APEX_BUILD_FOR_PRE_S_DEVICES

11
target/product/gsi_release.mk
View File

@@ -47,17 +47,6 @@ PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
# Disable the build-time debugfs restrictions on GSI builds # Disable the build-time debugfs restrictions on GSI builds
PRODUCT_SET_DEBUGFS_RESTRICTIONS := false PRODUCT_SET_DEBUGFS_RESTRICTIONS := false
# 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
# The flattened version of com.android.apex.cts.shim.v1 should be explicitly installed
# because the shim apex is prebuilt one and PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES is not
# supported for prebuilt_apex modules yet.
PRODUCT_PACKAGES += com.android.apex.cts.shim.v1_with_prebuilts.flattened
# GSI specific tasks on boot # GSI specific tasks on boot
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
gsi_skip_mount.cfg \ gsi_skip_mount.cfg \