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

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

Change aosp_$arch.mk to inherit from gsi_common.mk 

The patch changes GSI (aosp_$arch) to inherit from gsi_common.mk
instead of aosp_base_telephony.mk.

The patch also clones the emulator_vendor.mk from emulator.mk to
include all vendor modules.

Bug: 119747870
Test: boot aosp_arm64-userdebug on a blueline device on master/P
Test: boot aosp_x86-userdebug on the emulator
Test: boot aosp_x86_64-userdebug on the emulator
Test: compare the out folder with/without the patch, only more content
Change-Id: Ibd398d4f93d2a964813e05ccd434975435d25adc
parent f6f5d8ad

target/board/generic_arm64/device.mk

+0 −9
Original line number Diff line number Diff line
@@ -14,15 +14,6 @@ 
# limitations under the License.

#



# NFC:

#   Provide default libnfc-nci.conf file for devices that does not have one in

#   vendor/etc because aosp system image (of aosp_$arch products) is going to

#   be used as GSI.

#   May need to remove the following for newly launched devices in P since this

#   NFC configuration file should be in vendor/etc, instead of system/etc

PRODUCT_COPY_FILES += \

    device/generic/common/nfc/libnfc-nci.conf:system/etc/libnfc-nci.conf



# Adjust the Dalvik heap to be appropriate for a tablet.

$(call inherit-product-if-exists, frameworks/base/build/tablet-dalvik-heap.mk)

$(call inherit-product-if-exists, frameworks/native/build/tablet-dalvik-heap.mk)

target/board/generic_x86/device.mk

+8 −8
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ 
# limitations under the License.

#



# NFC:

#   Provide default libnfc-nci.conf file for devices that does not have one in

#   vendor/etc because aosp system image (of aosp_$arch products) is going to

#   be used as GSI.

#   May need to remove the following for newly launched devices in P since this

#   NFC configuration file should be in vendor/etc, instead of system/etc

PRODUCT_COPY_FILES += \

    device/generic/common/nfc/libnfc-nci.conf:system/etc/libnfc-nci.conf
 
ifdef NET_ETH0_STARTONBOOT

  PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1

endif



# Ensure we package the BIOS files too.

PRODUCT_PACKAGES += \

	bios.bin \

	vgabios-cirrus.bin \

target/board/generic_x86_64/device.mk

+8 −8
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ 
# limitations under the License.

#



# NFC:

#   Provide default libnfc-nci.conf file for devices that does not have one in

#   vendor/etc because aosp system image (of aosp_$arch products) is going to

#   be used as GSI.

#   May need to remove the following for newly launched devices in P since this

#   NFC configuration file should be in vendor/etc, instead of system/etc

PRODUCT_COPY_FILES += \

    device/generic/common/nfc/libnfc-nci.conf:system/etc/libnfc-nci.conf
 
ifdef NET_ETH0_STARTONBOOT

  PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1

endif



# Ensure we package the BIOS files too.

PRODUCT_PACKAGES += \

	bios.bin \

	vgabios-cirrus.bin \

target/product/aosp_arm.mk

+9 −23
Original line number Diff line number Diff line
@@ -21,29 +21,15 @@ 
# - VNDK enforcement

# - compatible property override enabled



-include device/generic/goldfish/arm32-vendor.mk

# GSI for system/product

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



include $(SRC_TARGET_DIR)/product/full.mk



# Enable dynamic partition size

PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true



# Enable A/B update

AB_OTA_UPDATER := true

AB_OTA_PARTITIONS := system

PRODUCT_PACKAGES += \

    update_engine \

    update_verifier



# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI

PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true



# GSI specific tasks on boot

PRODUCT_COPY_FILES += \

    build/make/target/product/gsi/skip_mount.cfg:system/etc/init/config/skip_mount.cfg \

    build/make/target/product/gsi/init.gsi.rc:system/etc/init/init.gsi.rc \



# Support addtional P vendor interface

PRODUCT_EXTRA_VNDK_VERSIONS := 28

# Emulator for vendor

$(call inherit-product-if-exists, device/generic/goldfish/arm32-vendor.mk)

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

$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)



PRODUCT_NAME := aosp_arm

PRODUCT_DEVICE := generic

PRODUCT_BRAND := Android

PRODUCT_MODEL := AOSP on ARM32

target/product/aosp_arm64.mk

+13 −28
Original line number Diff line number Diff line
@@ -26,7 +26,18 @@ 
# build quite specifically for the emulator, and might not be

# entirely appropriate to inherit from for on-device configurations.



-include device/generic/goldfish/arm64-vendor.mk

# GSI for system/product

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

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



# Emulator for vendor

$(call inherit-product-if-exists, device/generic/goldfish/arm64-vendor.mk)

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

$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.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:
@@ -36,33 +47,7 @@ 
PRODUCT_COPY_FILES += \

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



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

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

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

$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)



# Enable dynamic partition size

PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true



# Enable A/B update

AB_OTA_UPDATER := true

AB_OTA_PARTITIONS := system

PRODUCT_PACKAGES += \

    update_engine \

    update_verifier



# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI

PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true



# GSI specific tasks on boot

PRODUCT_COPY_FILES += \

    build/make/target/product/gsi/skip_mount.cfg:system/etc/init/config/skip_mount.cfg \

    build/make/target/product/gsi/init.gsi.rc:system/etc/init/init.gsi.rc \



# Support addtional P vendor interface

PRODUCT_EXTRA_VNDK_VERSIONS := 28



PRODUCT_NAME := aosp_arm64

PRODUCT_DEVICE := generic_arm64

PRODUCT_BRAND := Android

PRODUCT_MODEL := AOSP on ARM arm64 Emulator
 
PRODUCT_MODEL := AOSP on ARM64