commit 28c2ed3985ebf92177d8002a859409fb93d36ae0
author Robert Shih <robertshih@google.com> Sun Oct 27 22:55:12 2019 -0700
committer Robert Shih <robertshih@google.com> Sun Oct 27 23:06:38 2019 -0700
tree bd37a3ce59ef3e49c2f80ca5b39f6a6b738c2e80
parent 7f84dcf500a7c98e76f95283de3a6abc0be858ff

DrmUtils: refactor IDrm/ICrypto creation

Added utilities to:
* Query config for IMediaDrmService usage
* Create remote vs local IDrm/ICrypto object based on aforementioned config

Bug: 134787536
Test: MediaDrmClearkeyTest#testClearKeyPlaybackCenc
Change-Id: I72df528c0bbd8a6dbd3c4962ac91eb89696bcaf7

drm/libmediadrm/Android.bp

diff --git a/drm/libmediadrm/Android.bp b/drm/libmediadrm/Android.bp
index 52c7438..b3fd7e9 100644
--- a/drm/libmediadrm/Android.bp
+++ b/drm/libmediadrm/Android.bp
@@ -24,6 +24,7 @@
         "SharedLibrary.cpp",
         "DrmHal.cpp",
         "CryptoHal.cpp",
+        "DrmUtils.cpp",
     ],
 
     local_include_dirs: [
@@ -58,6 +59,12 @@
         "libhidlbase",
     ],
 
+    export_shared_lib_headers: [
+        "android.hardware.drm@1.0",
+        "android.hardware.drm@1.1",
+        "android.hardware.drm@1.2",
+    ],
+
     cflags: [
         "-Werror",
         "-Wall",