Merge "updatable_apex.mk is not inherited from mainline_system.mk" (857a2fcf) · Commits · e / os / android_build

target/board/BoardConfigGsiCommon.mk

+0 −4

Original line number	Diff line number	Diff line
		@@ -52,7 +52,3 @@ BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216

		# Disable 64 bit mediadrmserver
		TARGET_ENABLE_MEDIADRM_64 :=

		# Ordinary (non-flattened) APEX may require kernel changes. For maximum compatibility,
		# use flattened APEX for GSI
		TARGET_FLATTEN_APEX := true

+3 −2

Original line number	Diff line number	Diff line
		@@ -18,8 +18,6 @@
		$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system.mk)
		$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system.mk)
		$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)
		# Enable updating of APEXes
		$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
		# Add adb keys to debuggable AOSP builds (if they exist)
		$(call inherit-product-if-exists, vendor/google/security/adb/vendor_key.mk)

		@@ -110,6 +108,9 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
		# Enable dynamic partition size
		PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true

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

		PRODUCT_NAME := mainline_system
		PRODUCT_BRAND := generic

+0 −1

Original line number	Diff line number	Diff line
		@@ -17,5 +17,4 @@
		# Inherit this when the target needs to support updating APEXes

		PRODUCT_PROPERTY_OVERRIDES := ro.apex.updatable=true
		PRODUCT_PACKAGES := com.android.apex.cts.shim.v1_prebuilt
		TARGET_FLATTEN_APEX := false