From cd581af95621ebdc458affc457c86585973cdef9 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Thu, 6 Apr 2023 15:19:48 +0000 Subject: [PATCH 1/2] Define mali configuration path explicitly This avoids mali trying to read `/data/data/com.mali.testjava` for its debug config. Bug: 205779871 Bug: 264489188 Test: manual - reboot device and check the absence of AVC denials (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:aa5b1036db7f53d253d533cded53654974f773c2) Merged-In: Id168e9ce380eb6d3657a83e74ec8afd52bbd584e Change-Id: Id168e9ce380eb6d3657a83e74ec8afd52bbd584e --- device.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/device.mk b/device.mk index e71b9951..7bc49203 100644 --- a/device.mk +++ b/device.mk @@ -236,6 +236,8 @@ PRODUCT_VENDOR_PROPERTIES += \ # Mali Configuration Properties # b/221255664 prevents setting PROTECTED_MAX_CORE_COUNT=2 PRODUCT_VENDOR_PROPERTIES += \ + vendor.mali.platform.config=/vendor/etc/mali/platform.config \ + vendor.mali.debug.config=/vendor/etc/mali/debug.config \ vendor.mali.base_protected_max_core_count=1 \ vendor.mali.base_protected_tls_max=67108864 \ vendor.mali.platform_agt_frequency_khz=24576 From 67a21afc779a3730b1a3039d66c138c76083b85e Mon Sep 17 00:00:00 2001 From: Kyle Zhang Date: Thu, 13 Apr 2023 00:41:11 +0000 Subject: [PATCH 2/2] Move Widevine drm to gs-common Bug: 277764729 Change-Id: I5ddd1153cdeb68d2ee9b0f4cda2080f55c9c008b --- device.mk | 1 + widevine/device.mk | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/device.mk b/device.mk index 7bc49203..ea8cf7df 100644 --- a/device.mk +++ b/device.mk @@ -31,6 +31,7 @@ include device/google/gs-common/gps/dump/log.mk include device/google/gs-common/radio/dump.mk include device/google/gs-common/umfw_stat/umfw_stat.mk include device/google/gs-common/gear/dumpstate/aidl.mk +include device/google/gs-common/widevine/widevine.mk TARGET_BOARD_PLATFORM := gs201 diff --git a/widevine/device.mk b/widevine/device.mk index 4451c7c4..c711f6f7 100644 --- a/widevine/device.mk +++ b/widevine/device.mk @@ -1,5 +1 @@ -PRODUCT_PACKAGES += \ - android.hardware.drm-service.clearkey \ - --include vendor/widevine/libwvdrmengine/apex/device/device.mk BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201-sepolicy/widevine \ No newline at end of file