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

Commit 558f3dd7 authored by SzuWei Lin's avatar SzuWei Lin
Browse files

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
parent a93c32e3

target/product/aosp_arm64_a.mk

+0 −2
Original line number Diff line number Diff line
@@ -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

target/product/aosp_arm64_ab.mk

+0 −2
Original line number Diff line number Diff line
@@ -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

target/product/aosp_arm_a.mk

+0 −2
Original line number Diff line number Diff line
@@ -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

target/product/aosp_arm_ab.mk

+0 −2
Original line number Diff line number Diff line
@@ -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

target/product/aosp_x86_64_a.mk

+0 −2
Original line number Diff line number Diff line
@@ -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