diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-06-21 06:08:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-21 06:08:08 +0000 |
| commit | 2a477ccdbb8016c55f325ebd06a620f6d37c9305 (patch) | |
| tree | 513770816bdc60a98c44cf67f2100a27e08e7aa5 | |
| parent | 0201a71f0ce6f16aacfca9b6c0053da0e21d9e7f (diff) | |
| parent | d0c29cbdeb4fd41a9256848f0a0904d87c9e20c6 (diff) | |
| download | build-2a477ccdbb8016c55f325ebd06a620f6d37c9305.tar.gz | |
Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" am: d0c29cbdeb
Original change: https://android-review.googlesource.com/c/platform/build/+/2629101
Change-Id: I26c965b0079dacc14c1b4a83ce545a919d7f33cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/product.mk | 2 | ||||
| -rw-r--r-- | core/soong_config.mk | 2 | ||||
| -rw-r--r-- | target/product/gsi_release.mk | 11 |
3 files changed, 0 insertions, 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 \ |