Commit b6eeae72 authored Oct 04, 2019 by Nikita Ioffe

Unconditionally install shim apex on system partition

Trying to do it on per-device basis is prone to errors and already
bitten us several times. For example, currently aosp_taimen doesn't
install shim apex on system partition, but specifies
ro.apex.updatable = "true", which means that it doesn't pass CTS tests.

Unconditionally installing shim APEX shouldn't introduce any problems
since apexd will skip its activation of devices that don't support
updatable APEX.

Test: m checkbuild
Bug: 140957666
Change-Id: I6b5e668b40b97752295c831684a7291842533c40

parent f89f29d6

target/product/base_system.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ PRODUCT_PACKAGES += \
		cgroups.json \
		charger \
		cmd \
		com.android.apex.cts.shim.v1_prebuilt \
		com.android.conscrypt \
		com.android.i18n \
		com.android.location.provider \

target/product/mainline_system.mk

+0 −3

Original line number	Diff line number	Diff line
		@@ -105,9 +105,6 @@ PRODUCT_HOST_PACKAGES += \
		# Enable dynamic partition size
		PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true

		PRODUCT_PACKAGES += \
		com.android.apex.cts.shim.v1_prebuilt

		PRODUCT_ENFORCE_RRO_TARGETS := *

		PRODUCT_NAME := mainline_system