commit 85ae6cce113cbdf9918c3281df6d06563f5a3493
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:04 2024 +0000
tree 0493cd1465eefda6141d1b23ebb1bb4dba92debc
parent 2ae7fb6e5528bcca8b1f11c75fefa10d1bbbd04b

Revert "Separate hdcp levels into a base 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: I574abf94fcc5b503388e5b7bf377bfdb88b6f39e

drm/aidl/vts/Android.bp

diff --git a/drm/aidl/vts/Android.bp b/drm/aidl/vts/Android.bp
index 27ce0d7..5139036 100644
--- a/drm/aidl/vts/Android.bp
+++ b/drm/aidl/vts/Android.bp
@@ -47,7 +47,6 @@
     ],
     static_libs: [
         "android.hardware.drm@1.0-helper",
-        "android.hardware.drm.common-V1-ndk",
         "android.hardware.drm-V1-ndk",
         "android.hardware.common-V2-ndk",
         "libaidlcommonsupport",
@@ -60,19 +59,13 @@
             data: [":libvtswidevine-arm-prebuilts"],
         },
         arm64: {
-            data: [
-                ":libvtswidevine-arm64-prebuilts",
-                ":libvtswidevine-arm-prebuilts",
-            ],
+            data: [":libvtswidevine-arm64-prebuilts", ":libvtswidevine-arm-prebuilts"],
         },
         x86: {
             data: [":libvtswidevine-x86-prebuilts"],
         },
         x86_64: {
-            data: [
-                ":libvtswidevine-x86_64-prebuilts",
-                ":libvtswidevine-x86-prebuilts",
-            ],
+            data: [":libvtswidevine-x86_64-prebuilts", ":libvtswidevine-x86-prebuilts"],
         },
     },
     test_suites: [