From 0272b56e053e78def99aaee26a89407cbee54abb Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 4 Nov 2022 06:49:05 +0000 Subject: [PATCH 1/2] gs201: remove prebuilt boot-user.img usage When $(TARGET_KERNEL_DIR) contains: * boot.img then use those as prebuilt boot images for the target build. Bug: 242812258 Change-Id: I10ccfaacfc77cc37eee085b27575fae515ceb088 --- BoardConfig-common.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 20ce92cc..bb2910a5 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -58,11 +58,7 @@ BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs TARGET_NO_BOOTLOADER := true TARGET_NO_RADIOIMAGE := true -ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) BOARD_PREBUILT_BOOTIMAGE := $(wildcard $(TARGET_KERNEL_DIR)/boot.img) -else -BOARD_PREBUILT_BOOTIMAGE := $(wildcard $(TARGET_KERNEL_DIR)/boot-user.img) -endif ifneq (,$(BOARD_PREBUILT_BOOTIMAGE)) TARGET_NO_KERNEL := true else From 1280444aa0d1f576f24079e91ba2af65d7c75c4f Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Fri, 4 Nov 2022 17:17:20 +1300 Subject: [PATCH 2/2] gs201: Bump deqp conformance level to 2023 Bug: b/244942205 Change-Id: I2dfce751c813f56f536c3f7693ef987302e8c5a2 --- device.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device.mk b/device.mk index c07032d9..977aa25f 100644 --- a/device.mk +++ b/device.mk @@ -244,8 +244,8 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \ frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \ frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute.xml \ - frameworks/native/data/etc/android.software.vulkan.deqp.level-2022-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \ - frameworks/native/data/etc/android.software.opengles.deqp.level-2022-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml + frameworks/native/data/etc/android.software.vulkan.deqp.level-2023-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \ + frameworks/native/data/etc/android.software.opengles.deqp.level-2023-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml ifeq ($(USE_SWIFTSHADER),true) PRODUCT_VENDOR_PROPERTIES += \