From 260d6dcd0b61e85c45ab555a08860b0870483826 Mon Sep 17 00:00:00 2001
From: Kyle Zhang <kelzhan@google.com>
Date: Tue, 18 Apr 2023 17:42:51 +0000
Subject: [PATCH 1/2] Move Widevine drm to gs-common

Bug: 277764729
Change-Id: I0172f73c31d216955ba9a04bf66d0fa1af95dc8f
---
 widevine/widevine.mk | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 widevine/widevine.mk

diff --git a/widevine/widevine.mk b/widevine/widevine.mk
new file mode 100644
index 0000000..c59c7b9
--- /dev/null
+++ b/widevine/widevine.mk
@@ -0,0 +1,4 @@
+PRODUCT_PACKAGES += \
+	android.hardware.drm-service.clearkey \
+
+-include vendor/widevine/libwvdrmengine/apex/device/device.mk
\ No newline at end of file

From 827c84ee7d44feac6d3dbd0ac3a41dccfdc0643c Mon Sep 17 00:00:00 2001
From: David Li <dvdli@google.com>
Date: Wed, 26 Apr 2023 14:52:35 +0800
Subject: [PATCH 2/2] audio: pack AIDL s/w effects

Pack the common s/w effects into the AIDL effect HAL enabled image.
Includes the following effects,
  1. libbundleaidl
  2. libreverbaidl
  3. libvisualizeraidl
  4. libdynamicsprocessingaidl
  5. libdownmixaidl
  6. libloudnessenhanceraidl

The project-specific effects should be add into the makefile in the
project folder.

Test: mm
Bug: 271500140
Change-Id: I4d89440791d43eaf03288d5f7bf6d61cbd21659f
---
 audio/aidl.mk | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/audio/aidl.mk b/audio/aidl.mk
index ae64e13..172b63d 100644
--- a/audio/aidl.mk
+++ b/audio/aidl.mk
@@ -4,6 +4,17 @@ DEVICE_MANIFEST_FILE += device/google/gs-common/audio/aidl/manifest.xml
 PRODUCT_PACKAGES += \
     android.hardware.audio.service-aidl.aoc
 
+# AIDL software effects. These are the effects supporting in all projects.
+# For the project-specific effects, such as haptic generator, please add them
+# to makefile in the project's device folder.
+PRODUCT_PACKAGES += \
+    libvisualizeraidl \
+    libbundleaidl \
+    libreverbaidl \
+    libdynamicsprocessingaidl \
+    libloudnessenhanceraidl \
+    libdownmixaidl \
+
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/aidl
 
 include device/google/gs-common/audio/common.mk