From 558f3dd79bbc40b85d30499d92c6e5693e4c1a46 Mon Sep 17 00:00:00 2001 From: SzuWei Lin Date: Wed, 6 Sep 2017 16:39:27 +0800 Subject: [PATCH] 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 --- target/product/aosp_arm64_a.mk | 2 -- target/product/aosp_arm64_ab.mk | 2 -- target/product/aosp_arm_a.mk | 2 -- target/product/aosp_arm_ab.mk | 2 -- target/product/aosp_x86_64_a.mk | 2 -- target/product/aosp_x86_64_ab.mk | 2 -- target/product/aosp_x86_a.mk | 2 -- target/product/aosp_x86_ab.mk | 2 -- target/product/treble_common.mk | 4 ++++ 9 files changed, 4 insertions(+), 16 deletions(-) diff --git a/target/product/aosp_arm64_a.mk b/target/product/aosp_arm64_a.mk index 84d4b4f6e..3c7af334d 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 75ded35b6..c96cb9180 100644 --- a/target/product/aosp_arm64_ab.mk +++ b/target/product/aosp_arm64_ab.mk @@ -27,8 +27,6 @@ PRODUCT_PACKAGES += \ 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 845d091f6..3060fa920 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 3a862eb77..98b2f9933 100644 --- a/target/product/aosp_arm_ab.mk +++ b/target/product/aosp_arm_ab.mk @@ -27,8 +27,6 @@ PRODUCT_PACKAGES += \ 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 53f8252f9..a7fb74097 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 6080695eb..4590dc599 100644 --- a/target/product/aosp_x86_64_ab.mk +++ b/target/product/aosp_x86_64_ab.mk @@ -27,8 +27,6 @@ PRODUCT_PACKAGES += \ 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 72d6e1ab0..9ed29955e 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 f3aef958b..404a4dadd 100644 --- a/target/product/aosp_x86_ab.mk +++ b/target/product/aosp_x86_ab.mk @@ -27,8 +27,6 @@ PRODUCT_PACKAGES += \ 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 070486dcf..1c38b02a6 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