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

Commit 164eed2e authored by Isaac Chen's avatar Isaac Chen
Browse files

Make aosp_$arch system images closer to GSIs 

This change modifies aosp_$arch product makefiles so their
system images can be closer to their respective GSIs.

The added contents in this CL are based on treble_common*.mk.
Contents specific to GSI are in aosp_$arch.mk.
Contents common to all devices are moved to full_base.mk.
Contents related to specific device are moved to device.mk.

BoardConfig related makefiles will be changed in another CL.

Bug: 70772101
Test: The following products can boot to home screen:
    $ lunch aosp_x86-userdebug; m -j; emulator
    $ lunch aosp_x86_64-userdebug; m -j; emulator
    $ lunch aosp_arm-userdebug; m -j; emulator
    $ lunch aosp_arm64-userdebug; m -j; emulator

Change-Id: I225a13dd74b3e748cc5d1705e1a453348b01d43f
parent 6bb69c4c

target/board/generic/device.mk

+17 −0
Original line number Diff line number Diff line
@@ -29,3 +29,20 @@ PRODUCT_COPY_FILES := \ 
    frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \

    device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \

    hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf



# minimal configuration for audio policy.

PRODUCT_COPY_FILES += \

    frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml:system/etc/audio_policy_configuration.xml \

    frameworks/av/services/audiopolicy/config/primary_audio_policy_configuration.xml:system/etc/primary_audio_policy_configuration.xml \

    frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:system/etc/r_submix_audio_policy_configuration.xml \

    frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:system/etc/audio_policy_volumes.xml \

    frameworks/av/services/audiopolicy/config/default_volume_tables.xml:system/etc/default_volume_tables.xml \



# 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

target/board/generic_arm64/device.mk

+17 −0
Original line number Diff line number Diff line
@@ -29,6 +29,23 @@ PRODUCT_COPY_FILES := \ 
    frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \

    device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml



# minimal configuration for audio policy.

PRODUCT_COPY_FILES += \

    frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml:system/etc/audio_policy_configuration.xml \

    frameworks/av/services/audiopolicy/config/primary_audio_policy_configuration.xml:system/etc/primary_audio_policy_configuration.xml \

    frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:system/etc/r_submix_audio_policy_configuration.xml \

    frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:system/etc/audio_policy_volumes.xml \

    frameworks/av/services/audiopolicy/config/default_volume_tables.xml:system/etc/default_volume_tables.xml \



# 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

+17 −0
Original line number Diff line number Diff line
@@ -29,6 +29,23 @@ PRODUCT_COPY_FILES := \ 
    frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \

    device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml



# minimal configuration for audio policy.

PRODUCT_COPY_FILES += \

    frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml:system/etc/audio_policy_configuration.xml \

    frameworks/av/services/audiopolicy/config/primary_audio_policy_configuration.xml:system/etc/primary_audio_policy_configuration.xml \

    frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:system/etc/r_submix_audio_policy_configuration.xml \

    frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:system/etc/audio_policy_volumes.xml \

    frameworks/av/services/audiopolicy/config/default_volume_tables.xml:system/etc/default_volume_tables.xml \



# 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



PRODUCT_PACKAGES := \

    audio.primary.goldfish \

    vibrator.goldfish

target/board/generic_x86_64/device.mk

+17 −0
Original line number Diff line number Diff line
@@ -29,6 +29,23 @@ PRODUCT_COPY_FILES := \ 
    frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \

    device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml



# minimal configuration for audio policy.

PRODUCT_COPY_FILES += \

    frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml:system/etc/audio_policy_configuration.xml \

    frameworks/av/services/audiopolicy/config/primary_audio_policy_configuration.xml:system/etc/primary_audio_policy_configuration.xml \

    frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:system/etc/r_submix_audio_policy_configuration.xml \

    frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:system/etc/audio_policy_volumes.xml \

    frameworks/av/services/audiopolicy/config/default_volume_tables.xml:system/etc/default_volume_tables.xml \



# 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



PRODUCT_PACKAGES := \

    audio.primary.goldfish \

    vibrator.goldfish

target/product/aosp_arm64.mk

+8 −0
Original line number Diff line number Diff line
@@ -30,6 +30,14 @@ PRODUCT_COPY_FILES += \ 
    prebuilts/qemu-kernel/arm64/3.18/kernel-qemu2:kernel-ranchu \

    device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu



# 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



$(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)