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

Commit d3eb960e authored Nov 20, 2019 by Justin Yun Committed by android-build-merger Nov 20, 2019

Merge "Inherit base system_ext.mk files for aosp targets" am: e948114a

am: 94509611

Change-Id: Ie845e05c84c0b780b16abd7a84521c60e0710bfd

parents d24f4727 94509611

target/product/aosp_arm.mk

+6 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,12 @@ endif

		PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \

		#
		# All components inherited here go to system_ext image
		#
		$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
		$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)

		#
		# All components inherited here go to product image
		#

target/product/aosp_arm64.mk

+6 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,12 @@ ifeq (aosp_arm64,$(TARGET_PRODUCT))
		PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
		endif

		#
		# All components inherited here go to system_ext image
		#
		$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
		$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)

		#
		# All components inherited here go to product image
		#

target/product/aosp_x86.mk

+6 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,12 @@ ifeq (aosp_x86,$(TARGET_PRODUCT))
		PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
		endif

		#
		# All components inherited here go to system_ext image
		#
		$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
		$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)

		#
		# All components inherited here go to product image
		#

target/product/aosp_x86_64.mk

+6 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,12 @@ ifeq (aosp_x86_64,$(TARGET_PRODUCT))
		PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
		endif

		#
		# All components inherited here go to system_ext image
		#
		$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
		$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)

		#
		# All components inherited here go to product image
		#

target/product/aosp_x86_arm.mk

+6 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,12 @@ PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
		system/product/% \
		system/system_ext/%

		#
		# All components inherited here go to system_ext image
		#
		$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
		$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)

		#
		# All components inherited here go to product image
		#