Merge "Inherit base system_ext.mk files for aosp targets" am: e948114a3d
am: 945096110d
am: d3eb960e4e
Change-Id: Ia7a1ccb34bd62ec585c73f4346f59aff5ba84432
This commit is contained in:
commit
8d8ab00016
8 changed files with 48 additions and 0 deletions
|
@ -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
|
||||
#
|
||||
|
|
|
@ -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
|
||||
#
|
||||
|
|
|
@ -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
|
||||
#
|
||||
|
|
|
@ -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
|
||||
#
|
||||
|
|
|
@ -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
|
||||
#
|
||||
|
|
|
@ -23,6 +23,12 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
|
|||
# Enable mainline checking
|
||||
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
|
||||
|
||||
#
|
||||
# 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
|
||||
#
|
||||
|
|
|
@ -26,6 +26,12 @@ ifeq (sdk_phone_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
|
||||
#
|
||||
|
|
|
@ -27,6 +27,12 @@ ifeq (sdk_phone_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
|
||||
#
|
||||
|
|
Loading…
Reference in a new issue