From 8edff8cec61104886bf541bca8d9ef2eb9b41a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Thu, 4 May 2023 05:40:03 +0000 Subject: [PATCH 1/2] Remove stray copy directive. This file is already added to the vendor image by device/google/gs-common/camera/lyric.mk. Bug: 280523635 Test: presubmit Change-Id: Iec3c035429922abac544d56d5f98c80aa76d48b2 --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index c94ac52b..a7b7d08c 100644 --- a/device.mk +++ b/device.mk @@ -617,7 +617,6 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.camera.concurrent.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.concurrent.xml \ frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml\ frameworks/native/data/etc/android.hardware.camera.raw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.raw.xml\ - vendor/google/services/LyricCameraHAL/src/vendor.android.hardware.camera.preview-dis.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/vendor.android.hardware.camera.preview-dis.xml\ #PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \ From bcd4a154d2884cf30ff5712f23ab3a3cefcefb17 Mon Sep 17 00:00:00 2001 From: Peiyong Lin Date: Wed, 26 Apr 2023 01:25:33 +0000 Subject: [PATCH 2/2] Update device.mk. USE_ANGLE in moved to core.mk across platform, this patch updated the usage of it in device.mk. Bug: 270994705 Test: atest CtsAngleIntegrationHostTestCases Change-Id: Ib9d869ab533f894f39a439e4e6c8910d57b492f2 --- device.mk | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/device.mk b/device.mk index 35064892..829e6a39 100644 --- a/device.mk +++ b/device.mk @@ -189,9 +189,6 @@ USES_GAUDIO := true # Must match BOARD_USES_SWIFTSHADER in BoardConfig.mk USE_SWIFTSHADER := false -# by default, USE_ANGLE is false -USE_ANGLE ?= false - # HWUI TARGET_USES_VULKAN = true @@ -229,13 +226,6 @@ PRODUCT_PACKAGES += \ libGLESv2_swiftshader endif -ifeq ($(USE_ANGLE),true) -PRODUCT_PACKAGES += \ - libEGL_angle \ - libGLESv1_CM_angle \ - libGLESv2_angle -endif - PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml \ frameworks/native/data/etc/android.hardware.vulkan.version-1_3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \ @@ -247,10 +237,6 @@ PRODUCT_COPY_FILES += \ ifeq ($(USE_SWIFTSHADER),true) PRODUCT_VENDOR_PROPERTIES += \ ro.hardware.egl = swiftshader -else ifeq ($(USE_ANGLE),true) -PRODUCT_VENDOR_PROPERTIES += \ - ro.hardware.egl = angle \ - ro.hardware.egl_legacy = mali else PRODUCT_VENDOR_PROPERTIES += \ ro.hardware.egl = mali