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

Commit 2999f29e authored by SzuWei Lin's avatar SzuWei Lin
Browse files

Move common 32/64 bits product settings to another files 

Move the common 32/64 bits product settings from aosp_xxx.mk to

    target/product/treble_common_(32|64).mk

The original core_64_bit.mk is not match the GSI requirement,
and will be revised soon. So, clone the content of
core_64_bit.mk into treble_common_64.mk.

Bug: 64653300
Test: Build pass
Change-Id: I6154a5c4927287c703a874b5cbf6a7f0c2c3594c
parent 025d5d91

target/product/aosp_arm64_a.mk

+3 −4
Original line number Diff line number Diff line
@@ -16,12 +16,11 @@ 


# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at

# /vendor/[build|default].prop when build split is on. In order to have sysprops

# on the generic system image, place them in build/make/target/board/generic_arm64_a/

# system.prop.

# on the generic system image, place them in build/make/target/board/

# treble_system.prop.



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

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/aosp_base_telephony.mk)



PRODUCT_NAME := aosp_arm64_a

target/product/aosp_arm64_ab.mk

+3 −4
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 


# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at

# /vendor/[build|default].prop when build split is on. In order to have sysprops

# on the generic system image, place them in build/make/target/board/generic_arm64_a/

# system.prop.

# on the generic system image, place them in build/make/target/board/

# treble_system.prop.



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

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



AB_OTA_UPDATER := true

AB_OTA_PARTITIONS := system
@@ -27,7 +27,6 @@ PRODUCT_PACKAGES += \ 
    update_engine \

    update_verifier



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

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



PRODUCT_NAME := aosp_arm64_ab

target/product/aosp_arm_a.mk

+3 −3
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 


# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at

# /vendor/[build|default].prop when build split is on. In order to have sysprops

# on the generic system image, place them in build/make/target/board/generic_arm_a/

# system.prop.

# on the generic system image, place them in build/make/target/board/

# treble_system.prop.



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

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



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

target/product/aosp_arm_ab.mk

+3 −3
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 


# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at

# /vendor/[build|default].prop when build split is on. In order to have sysprops

# on the generic system image, place them in build/make/target/board/generic_arm_a/

# system.prop.

# on the generic system image, place them in build/make/target/board/

# treble_system.prop.



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

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



AB_OTA_UPDATER := true

AB_OTA_PARTITIONS := system

target/product/aosp_x86_64_a.mk

+3 −4
Original line number Diff line number Diff line
@@ -16,12 +16,11 @@ 


# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at

# /vendor/[build|default].prop when build split is on. In order to have sysprops

# on the generic system image, place them in build/make/target/board/generic_arm64_a/

# system.prop.

# on the generic system image, place them in build/make/target/board/

# treble_system.prop.



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

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/aosp_base_telephony.mk)



PRODUCT_NAME := aosp_x86_64_a