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

Commit 4ff6dbe0 authored Jun 21, 2023 by Treehugger Robot Committed by Automerger Merge Worker Jun 21, 2023

Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" am: d0c29cbd am:...

Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" am: d0c29cbd am: 2a477ccd am: 1ff91ea2 am: adb009c0 am: eab5aff6

Original change: https://android-review.googlesource.com/c/platform/build/+/2629101

Change-Id: I19f931f077b620a0b16d2243cae10659f4aff133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 4671ae0f eab5aff6

core/product.mk

+0 −2

Original line number	Diff line number	Diff line
		@@ -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.

core/soong_config.mk

+0 −2

Original line number	Diff line number	Diff line
		@@ -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

target/product/gsi_release.mk

+0 −11

Original line number	Diff line number	Diff line
		@@ -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 \