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

Commit d819512e authored by android-build-team Robot's avatar android-build-team Robot Committed by Android (Google) Code Review
Browse files

Merge "Add vr_hwc to GSI" into pi-dev

parents c0890b93 ece9324b

target/product/aosp_arm.mk

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ PRODUCT_COPY_FILES += \ 
    prebuilts/qemu-kernel/arm64/3.18/kernel-qemu2:kernel-ranchu-64 \

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



# TODO(b/78308559): includes vr_hwc into GSI before vr_hwc move to vendor

PRODUCT_PACKAGES += \

    vr_hwc



include $(SRC_TARGET_DIR)/product/full.mk



PRODUCT_NAME := aosp_arm

target/product/aosp_arm64.mk

+4 −0
Original line number Diff line number Diff line
@@ -38,6 +38,10 @@ PRODUCT_COPY_FILES += \ 
PRODUCT_COPY_FILES += \

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



# TODO(b/78308559): includes vr_hwc into GSI before vr_hwc move to vendor

PRODUCT_PACKAGES += \

    vr_hwc



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

target/product/aosp_x86.mk

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ PRODUCT_COPY_FILES += \ 
    device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \

    prebuilts/qemu-kernel/x86_64/4.9/kernel-qemu2:kernel-ranchu-64



# TODO(b/78308559): includes vr_hwc into GSI before vr_hwc move to vendor

PRODUCT_PACKAGES += \

    vr_hwc



include $(SRC_TARGET_DIR)/product/full_x86.mk



PRODUCT_NAME := aosp_x86

target/product/aosp_x86_64.mk

+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ PRODUCT_COPY_FILES += \ 
PRODUCT_COPY_FILES += \

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



# TODO(b/78308559): includes vr_hwc into GSI before vr_hwc move to vendor

PRODUCT_PACKAGES += \

    vr_hwc



$(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_x86_64/device.mk)

target/product/treble_common.mk

+4 −0
Original line number Diff line number Diff line
@@ -84,3 +84,7 @@ PRODUCT_PACKAGES += \ 
# Set current VNDK version for GSI

PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \

    ro.gsi.vndk.version=$(PLATFORM_VNDK_VERSION)



# TODO(b/78308559): includes vr_hwc into GSI before vr_hwc move to vendor

PRODUCT_PACKAGES += \

    vr_hwc