From 8a192d510567073dabe2ba60409eb44a4a4a2e24 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Thu, 6 Apr 2023 15:19:40 +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:9802c0e5a5515c8abf1755a6f39a2e6d562cd6e6) Merged-In: Ib741cb37c418b4601109c4d75c25373a110ca231 Change-Id: Ib741cb37c418b4601109c4d75c25373a110ca231 --- device.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/device.mk b/device.mk index cf12b257..97f2e1e5 100644 --- a/device.mk +++ b/device.mk @@ -215,6 +215,8 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ # Mali Configuration Properties 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=3 \ vendor.mali.base_protected_tls_max=67108864 \ vendor.mali.platform_agt_frequency_khz=24576 From baf54e8c63c65fa7388b8567dd4bb5261b50ab6c Mon Sep 17 00:00:00 2001 From: Kyle Zhang Date: Thu, 13 Apr 2023 00:42:16 +0000 Subject: [PATCH 2/2] Move Widevine drm to gs-common Bug: 277764729 Change-Id: I897a82d4946bd23b0edf439cefff2d6003e8b200 --- device.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/device.mk b/device.mk index 97f2e1e5..35064892 100644 --- a/device.mk +++ b/device.mk @@ -30,6 +30,7 @@ include device/google/gs-common/radio/dump.mk include device/google/gs-common/gear/dumpstate/aidl.mk include device/google/gs-common/camera/dump.mk include device/google/gs-common/gps/dump/log.mk +include device/google/gs-common/widevine/widevine.mk TARGET_BOARD_PLATFORM := gs101 DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false) @@ -533,10 +534,7 @@ PRODUCT_PACKAGES += \ # WideVine modules PRODUCT_PACKAGES += \ - android.hardware.drm-service.clearkey \ - liboemcrypto \ - --include vendor/widevine/libwvdrmengine/apex/device/device.mk + liboemcrypto $(call soong_config_set,google3a_config,soc,gs101) $(call soong_config_set,google3a_config,gcam_awb,true)