From 8cc42f429f404e6234e218102700f006c2371d95 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Tue, 20 Jun 2023 14:27:10 +0900 Subject: [PATCH] Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES 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 --- core/product.mk | 2 -- core/soong_config.mk | 2 -- target/product/gsi_release.mk | 11 ----------- 3 files changed, 15 deletions(-) diff --git a/core/product.mk b/core/product.mk index 7e67dcdf7e..8f4db38038 100644 --- a/core/product.mk +++ b/core/product.mk @@ -378,8 +378,6 @@ _product_single_value_vars += PRODUCT_ENFORCE_INTER_PARTITION_JAVA_SDK_LIBRARY # a java_sdk_library module. _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 # init-second-stage to load debug policy from system_ext. # This option is only meant to be set by compliance GSI targets. diff --git a/core/soong_config.mk b/core/soong_config.mk index 6c613d69b6..5f62ec6a08 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -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_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))) ifndef APEX_BUILD_FOR_PRE_S_DEVICES diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk index 3b977927d1..375b7cb02e 100644 --- a/target/product/gsi_release.mk +++ b/target/product/gsi_release.mk @@ -47,17 +47,6 @@ PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true # Disable the build-time debugfs restrictions on GSI builds 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 PRODUCT_PACKAGES += \ gsi_skip_mount.cfg \