From ac477cd03476ef95659291373b217d155999332c Mon Sep 17 00:00:00 2001 From: Michael Butler Date: Tue, 25 Oct 2022 13:24:02 -0700 Subject: [PATCH 1/2] Add libedgetpu_dba_hal.google.so to system_ext image This change is in response to libedgetpu_dba_hal.so being renamed to libedgetpu_dba_hal.google.so. Bug: 245792277 Test: mma Test: atest edgetpu_dba_hal_test Test: edgetpu_dba_hal_dlopen_test Change-Id: Ib928ba2f3054add7d90c5e8b40070649143fe11c --- edgetpu/edgetpu.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edgetpu/edgetpu.mk b/edgetpu/edgetpu.mk index 68003db2..ef74bcd0 100644 --- a/edgetpu/edgetpu.mk +++ b/edgetpu/edgetpu.mk @@ -35,6 +35,6 @@ PRODUCT_PACKAGES += \ # TPU DBA HAL C API library PRODUCT_PACKAGES += \ - libedgetpu_dba_hal + libedgetpu_dba_hal.google BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/edgetpu/ From 645cd95660d1d0983c03d1b85bdd80f96ef09c4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Wed, 26 Oct 2022 00:11:40 +0000 Subject: [PATCH 2/2] Set displaycolor platform variable to gs101. Bug: 241708558 Test: presubmit Change-Id: Ie9517510bc8fe481571fdec1629cad027750c126 --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 968f0c52..2e6c9e7e 100644 --- a/device.mk +++ b/device.mk @@ -632,6 +632,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ debug.hwc.winupdate=1 # hw composer HAL +$(call soong_config_set,google_displaycolor,displaycolor_platform,gs101) PRODUCT_PACKAGES += \ libdisplaycolor \ hwcomposer.$(TARGET_BOARD_PLATFORM)