commit 8d38533b9aa285fca2f6b1c6b1cf7b0498b53311
author Priyanka Advani (xWF) <padvani@google.com> Tue Oct 01 16:53:02 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 01 16:53:07 2024 +0000
tree f1a408de6bc0ae66d36ea9365839647f4568fbd4
parent acd5def6b4bb1d9e8036565947c8a36ba01f68c8

Revert "Sync with new drm common aidl interface"

Revert submission 3283232-cherrypicker-L65300030006744043:N33800030107981038

Reason for revert: Droidmonitor created revert due to b/370755706. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:3283232-cherrypicker-L65300030006744043:N33800030107981038

Change-Id: I151f439282c18dd8b8e7f7741faf210638e88dee

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 d22be78..9a06bd2 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",