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

Commit 52971ca0 authored by Steven Moreland's avatar Steven Moreland
Browse files

Remove vr_hwc from GSI image. 

Not all phones support the VR, so on phones
that don't, the inclusion of vr_hwc is causing
VtsHalGraphicsComposerV2_1Target failures.

Bug: 109913118
Test: vr_hwc is not on aosp_arm64_ab
Change-Id: I803b4dddc5a87e35875992ad9421c644698112f1
parent f012f150

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -491,6 +491,8 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher3_interm 
# Remove old merged AndroidManifest.xml location

$(call add-clean-step, rm -rf $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS/*_intermediates/AndroidManifest.xml)



$(call add-clean-step, find $(PRODUCT_OUT) -type f -name "vr_hwc*" -print0 | xargs -0 rm -f)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

target/product/aosp_arm.mk

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


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



# 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



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

target/product/aosp_arm64.mk

+0 −4
Original line number Diff line number Diff line
@@ -29,10 +29,6 @@ 
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/emulator.mk)

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

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

target/product/aosp_x86.mk

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


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



# 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



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

target/product/aosp_x86_64.mk

+0 −4
Original line number Diff line number Diff line
@@ -29,10 +29,6 @@ 
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/emulator.mk)

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

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