commit 0c679bd4bdfce0fc7ff0591658f35dad2b8ad3a6
author Jiyong Park <jiyong@google.com> Fri Jun 16 01:31:33 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 16 01:31:33 2017 +0000
tree e1beb755fdccd8290c6799b3e46c45b289ba4d26
parent b125fc964febebec06f47dce88a89b5ce9afad46
parent 95fb5344d4da347020e09c0bfd2d8ae64362a232

Merge "libdrmclearkeyplugin is linked against libstagefright_foundation_vendor" into oc-dr1-dev
am: 95fb5344d4

Change-Id: If71e90594b9e52f12e58205a976454b319075aa8

drm/mediadrm/plugins/clearkey/Android.bp

diff --git a/drm/mediadrm/plugins/clearkey/Android.bp b/drm/mediadrm/plugins/clearkey/Android.bp
index 6af7cd8..f3ce65c 100644
--- a/drm/mediadrm/plugins/clearkey/Android.bp
+++ b/drm/mediadrm/plugins/clearkey/Android.bp
@@ -38,12 +38,17 @@
     shared_libs: [
         "libcrypto",
         "liblog",
-        "libstagefright_foundation",
+        "libstagefright_foundation_vendor",
         "libutils",
     ],
 
     static_libs: ["libjsmn"],
 
+    include_dirs: [
+        "frameworks/native/include",
+        "frameworks/av/include",
+    ],
+
     export_include_dirs: ["."],
     export_static_lib_headers: ["libjsmn"],
 }

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

diff --git a/drm/mediadrm/plugins/clearkey/tests/Android.bp b/drm/mediadrm/plugins/clearkey/tests/Android.bp
index 1b208ad..976c590 100644
--- a/drm/mediadrm/plugins/clearkey/tests/Android.bp
+++ b/drm/mediadrm/plugins/clearkey/tests/Android.bp
@@ -19,6 +19,7 @@
 
 cc_test {
     name: "ClearKeyDrmUnitTest",
+    vendor: true,
 
     srcs: [
         "AesCtrDecryptorUnittest.cpp",
@@ -30,7 +31,7 @@
         "libcrypto",
         "libdrmclearkeyplugin",
         "liblog",
-        "libstagefright_foundation",
+        "libstagefright_foundation_vendor",
         "libutils",
     ],
 }