commit 45c5ad3b8f2dd99fe273fd5441b500658a06a209
author Liana Kazanova <lkazanova@google.com> Tue Oct 01 18:16:38 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 01 18:16:38 2024 +0000
tree bc69a92246e6825a4b5f0477fcdb5baf5889357c
parent 30ce127f70a23f66a299765d2527d592b922e85f
parent 4b93de7e0d1cb96ddefd86728583ab0ebf06f594

Merge "Revert "Sync with new drm common aidl interface"" into android15-tests-dev am: 4b93de7e0d

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

Change-Id: Ia408ea6259ebf0def7f6d63220fec25cddda6c3c
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 88f0571..b1a01e4 100644
--- a/drm/libmediadrmrkp/Android.bp
+++ b/drm/libmediadrmrkp/Android.bp
@@ -14,7 +14,6 @@
     ],
     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",
@@ -40,7 +39,6 @@
     ],
     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 079e075..cce6338 100644
--- a/drm/mediadrm/plugins/clearkey/aidl/Android.bp
+++ b/drm/mediadrm/plugins/clearkey/aidl/Android.bp
@@ -40,7 +40,6 @@
 
     static_libs: [
         "android.hardware.common-V2-ndk",
-        "android.hardware.drm.common-V1-ndk",
         "android.hardware.drm-V1-ndk",
         "libbase",
         "libclearkeybase",