Revise GSI to inherit from aosp_base.mk and telephony.mk
GSI inherited from aosp_base_telephony.mk, but it included some settings for
emulator. So this patch changes to inherit from more pure makefiles to
includes AOSP and telephony modules.
Bug: 65332895
Test: Test on some Pixel devices with GSI, boot to home screen
Change-Id: I98523e864ccf06ddba4422bc8380bc6ff0095d5a
diff --git a/target/product/aosp_arm64_a.mk b/target/product/aosp_arm64_a.mk
index 84d4b4f..3c7af33 100644
--- a/target/product/aosp_arm64_a.mk
+++ b/target/product/aosp_arm64_a.mk
@@ -21,8 +21,6 @@
include build/make/target/product/treble_common_64.mk
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
-
PRODUCT_NAME := aosp_arm64_a
PRODUCT_DEVICE := generic_arm64_a
PRODUCT_BRAND := Android
diff --git a/target/product/aosp_arm64_ab.mk b/target/product/aosp_arm64_ab.mk
index 75ded35..c96cb91 100644
--- a/target/product/aosp_arm64_ab.mk
+++ b/target/product/aosp_arm64_ab.mk
@@ -27,8 +27,6 @@
update_engine \
update_verifier
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
-
PRODUCT_NAME := aosp_arm64_ab
PRODUCT_DEVICE := generic_arm64_ab
PRODUCT_BRAND := Android
diff --git a/target/product/aosp_arm_a.mk b/target/product/aosp_arm_a.mk
index 845d091..3060fa9 100644
--- a/target/product/aosp_arm_a.mk
+++ b/target/product/aosp_arm_a.mk
@@ -21,8 +21,6 @@
include build/make/target/product/treble_common_32.mk
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
-
PRODUCT_NAME := aosp_arm_a
PRODUCT_DEVICE := generic_arm_a
PRODUCT_BRAND := Android
diff --git a/target/product/aosp_arm_ab.mk b/target/product/aosp_arm_ab.mk
index 3a862eb..98b2f99 100644
--- a/target/product/aosp_arm_ab.mk
+++ b/target/product/aosp_arm_ab.mk
@@ -27,8 +27,6 @@
update_engine \
update_verifier
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
-
PRODUCT_NAME := aosp_arm_ab
PRODUCT_DEVICE := generic_arm_ab
PRODUCT_BRAND := Android
diff --git a/target/product/aosp_x86_64_a.mk b/target/product/aosp_x86_64_a.mk
index 53f8252..a7fb740 100644
--- a/target/product/aosp_x86_64_a.mk
+++ b/target/product/aosp_x86_64_a.mk
@@ -21,8 +21,6 @@
include build/make/target/product/treble_common_64.mk
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
-
PRODUCT_NAME := aosp_x86_64_a
PRODUCT_DEVICE := generic_x86_64_a
PRODUCT_BRAND := Android
diff --git a/target/product/aosp_x86_64_ab.mk b/target/product/aosp_x86_64_ab.mk
index 6080695..4590dc5 100644
--- a/target/product/aosp_x86_64_ab.mk
+++ b/target/product/aosp_x86_64_ab.mk
@@ -27,8 +27,6 @@
update_engine \
update_verifier
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
-
PRODUCT_NAME := aosp_x86_64_ab
PRODUCT_DEVICE := generic_x86_64_ab
PRODUCT_BRAND := Android
diff --git a/target/product/aosp_x86_a.mk b/target/product/aosp_x86_a.mk
index 72d6e1a..9ed2995 100644
--- a/target/product/aosp_x86_a.mk
+++ b/target/product/aosp_x86_a.mk
@@ -21,8 +21,6 @@
include build/make/target/product/treble_common_32.mk
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
-
PRODUCT_NAME := aosp_x86_a
PRODUCT_DEVICE := generic_x86_a
PRODUCT_BRAND := Android
diff --git a/target/product/aosp_x86_ab.mk b/target/product/aosp_x86_ab.mk
index f3aef95..404a4da 100644
--- a/target/product/aosp_x86_ab.mk
+++ b/target/product/aosp_x86_ab.mk
@@ -27,8 +27,6 @@
update_engine \
update_verifier
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
-
PRODUCT_NAME := aosp_x86_ab
PRODUCT_DEVICE := generic_x86_ab
PRODUCT_BRAND := Android
diff --git a/target/product/treble_common.mk b/target/product/treble_common.mk
index 070486d..1c38b02 100644
--- a/target/product/treble_common.mk
+++ b/target/product/treble_common.mk
@@ -19,6 +19,10 @@
# on the generic system image, place them in build/make/target/board/
# treble_system.prop.
+# Generic system image inherits from AOSP with telephony
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk)
+
# Split selinux policy
PRODUCT_FULL_TREBLE_OVERRIDE := true