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

Commit f6f5d8ad authored by SzuWei Lin's avatar SzuWei Lin
Browse files

Change Legacy GSI to inherit from gsi_common.mk 

The patch change Legacy GSI (aosp_$arch_(a|b)) to inherit from
gsi_common.mk instead of treble_common.mk

It does not inherit from gsi_common.mk directy. The patch adds
legacy_gsi_common.mk to extend gsi_common.mk, and all Legacy
GSI inherit from legcay_gsi_common.mk.

The patch also removed treble_common*.mk.

Bug: 119747870
Test: flash aosp_arm64_ab-userdebug on blueline P
Test: flash aosp_arm64_ab-userdebug on walleye O-MR1
Change-Id: If54760484cc0937719c1336f1a4caac8468d2009
parent 54ea4b76

target/product/aosp_arm64_a.mk

+14 −1
Original line number Diff line number Diff line
@@ -19,7 +19,20 @@ 
# on the generic system image, place them in build/make/target/board/

# gsi_system.prop.



include build/make/target/product/treble_common_64.mk

$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/legacy_gsi_common.mk)



PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \

    root/init.zygote32_64.rc \

    root/init.zygote64_32.rc \



# Copy different zygote settings for vendor.img to select by setting property

# ro.zygote=zygote64_32 or ro.zygote=zygote32_64:

#   1. 64-bit primary, 32-bit secondary OR

#   2. 32-bit primary, 64-bit secondary

# init.zygote64_32.rc is in the core_64_bit.mk below

PRODUCT_COPY_FILES += \

    system/core/rootdir/init.zygote32_64.rc:root/init.zygote32_64.rc



PRODUCT_NAME := aosp_arm64_a

PRODUCT_DEVICE := generic_arm64_a

target/product/aosp_arm64_ab.mk

+13 −7
Original line number Diff line number Diff line
@@ -24,14 +24,20 @@ 
# - 64 bits binder interface

# - system-as-root



include build/make/target/product/treble_common_64.mk

$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/legacy_gsi_common.mk)



# Enable A/B update

AB_OTA_UPDATER := true

AB_OTA_PARTITIONS := system

PRODUCT_PACKAGES += \

    update_engine \

    update_verifier

PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \

    root/init.zygote32_64.rc \

    root/init.zygote64_32.rc \



# Copy different zygote settings for vendor.img to select by setting property

# ro.zygote=zygote64_32 or ro.zygote=zygote32_64:

#   1. 64-bit primary, 32-bit secondary OR

#   2. 32-bit primary, 64-bit secondary

# init.zygote64_32.rc is in the core_64_bit.mk below

PRODUCT_COPY_FILES += \

    system/core/rootdir/init.zygote32_64.rc:root/init.zygote32_64.rc



PRODUCT_NAME := aosp_arm64_ab

PRODUCT_DEVICE := generic_arm64_ab

target/product/aosp_arm_a.mk

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
# on the generic system image, place them in build/make/target/board/

# gsi_system.prop.



include build/make/target/product/treble_common_32.mk

$(call inherit-product, $(SRC_TARGET_DIR)/product/legacy_gsi_common.mk)



PRODUCT_NAME := aosp_arm_a

PRODUCT_DEVICE := generic_arm_a

target/product/aosp_arm_ab.mk

+1 −8
Original line number Diff line number Diff line
@@ -24,14 +24,7 @@ 
# - 32 bits binder interface

# - system-as-root



include build/make/target/product/treble_common_32.mk



# Enable A/B update

AB_OTA_UPDATER := true

AB_OTA_PARTITIONS := system

PRODUCT_PACKAGES += \

    update_engine \

    update_verifier

$(call inherit-product, $(SRC_TARGET_DIR)/product/legacy_gsi_common.mk)



PRODUCT_NAME := aosp_arm_ab

PRODUCT_DEVICE := generic_arm_ab

target/product/aosp_x86_64_a.mk

+14 −1
Original line number Diff line number Diff line
@@ -19,7 +19,20 @@ 
# on the generic system image, place them in build/make/target/board/

# gsi_system.prop.



include build/make/target/product/treble_common_64.mk

$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/legacy_gsi_common.mk)



PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \

    root/init.zygote32_64.rc \

    root/init.zygote64_32.rc \



# Copy different zygote settings for vendor.img to select by setting property

# ro.zygote=zygote64_32 or ro.zygote=zygote32_64:

#   1. 64-bit primary, 32-bit secondary OR

#   2. 32-bit primary, 64-bit secondary

# init.zygote64_32.rc is in the core_64_bit.mk below

PRODUCT_COPY_FILES += \

    system/core/rootdir/init.zygote32_64.rc:root/init.zygote32_64.rc



PRODUCT_NAME := aosp_x86_64_a

PRODUCT_DEVICE := generic_x86_64_a