commit 5464e3377168b0b14428b4a46c9ddb2b11cbb15d
author Huihong Luo <huisinro@google.com> Tue Oct 01 16:05:08 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 01 16:05:08 2024 +0000
tree b2cf4f944dce29b9591a58cbd1e102afad458209
parent 5b8a7fe6e34023688d647c18f21e9bfffba5bcb7
parent 4421b8dd8edd179ac805ebc1661ba26e6717446e

Merge "Sync with new drm common aidl interface" into android15-tests-dev am: 4421b8dd8e

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3285749

Change-Id: I01912e288a6affced7d7dfad16a41d19eb730edc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

drm/libmediadrmrkp/Android.bp

diff --git a/drm/libmediadrmrkp/Android.bp b/drm/libmediadrmrkp/Android.bp
index b1a01e4..88f0571 100644
--- a/drm/libmediadrmrkp/Android.bp
+++ b/drm/libmediadrmrkp/Android.bp
@@ -14,6 +14,7 @@
     ],
     static_libs: [
         "android.hardware.common-V2-ndk",
+        "android.hardware.drm.common-V1-ndk",
         "android.hardware.drm-V1-ndk",
         "android.hardware.security.rkp-V3-ndk",
         "libbase",
@@ -39,6 +40,7 @@
     ],
     static_libs: [
         "android.hardware.common-V2-ndk",
+        "android.hardware.drm.common-V1-ndk",
         "android.hardware.drm-V1-ndk",
         "android.hardware.security.rkp-V3-ndk",
         "libbase",

drm/mediadrm/plugins/clearkey/aidl/Android.bp

diff --git a/drm/mediadrm/plugins/clearkey/aidl/Android.bp b/drm/mediadrm/plugins/clearkey/aidl/Android.bp
index cce6338..079e075 100644
--- a/drm/mediadrm/plugins/clearkey/aidl/Android.bp
+++ b/drm/mediadrm/plugins/clearkey/aidl/Android.bp
@@ -40,6 +40,7 @@
 
     static_libs: [
         "android.hardware.common-V2-ndk",
+        "android.hardware.drm.common-V1-ndk",
         "android.hardware.drm-V1-ndk",
         "libbase",
         "libclearkeybase",