Inherit base system_ext.mk files for aosp targets
Make aosp targets inherit handheld_system_ext.mk and
telephony_system_ext.mk files.
Devices that have /system_ext or /system/system_ext must inherit any
of *_system_ext.mk files to install mandatory packages for system_ext
partition.
Bug: 144542478
Test: Build aosp targets
Change-Id: Ie160998150caa953c9a34726525cdbcefc222841
diff --git a/aosp_blueline.mk b/aosp_blueline.mk
index edcf10c..f734c69 100644
--- a/aosp_blueline.mk
+++ b/aosp_blueline.mk
@@ -25,6 +25,12 @@
#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
#
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
diff --git a/aosp_crosshatch.mk b/aosp_crosshatch.mk
index 6503a0c..bb3389a 100644
--- a/aosp_crosshatch.mk
+++ b/aosp_crosshatch.mk
@@ -25,6 +25,12 @@
#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
#
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
