commit 13aa1a4b6630a05fc3e48824b911009ecbb33284
author Marco Nelissen <marcone@google.com> Fri Sep 27 10:21:55 2019 -0700
committer Marco Nelissen <marcone@google.com> Mon Sep 30 14:04:37 2019 -0700
tree 506fa3026d84685c2621157b9b668155c31ae0ec
parent e3cdab3c40cb71284a0e186d7d5a82257e7d34a1

Remove libmediadrm symlinks

Test: build
Change-Id: I53d703b6d34226926437b0207a2b3d51dff6881a

media/codec2/components/cmds/Android.bp

diff --git a/media/codec2/components/cmds/Android.bp b/media/codec2/components/cmds/Android.bp
index 35f689e..681a171 100644
--- a/media/codec2/components/cmds/Android.bp
+++ b/media/codec2/components/cmds/Android.bp
@@ -9,6 +9,10 @@
     include_dirs: [
     ],
 
+    header_libs: [
+        "libmediadrm_headers",
+    ],
+
     shared_libs: [
         "libbase",
         "libbinder",

media/codec2/components/cmds/codec2.cpp

diff --git a/media/codec2/components/cmds/codec2.cpp b/media/codec2/components/cmds/codec2.cpp
index f2cf545..479f064 100644
--- a/media/codec2/components/cmds/codec2.cpp
+++ b/media/codec2/components/cmds/codec2.cpp
@@ -31,7 +31,7 @@
 #include <binder/IServiceManager.h>
 #include <binder/ProcessState.h>
 #include <media/DataSource.h>
-#include <media/ICrypto.h>
+#include <mediadrm/ICrypto.h>
 #include <media/IMediaHTTPService.h>
 #include <media/MediaSource.h>
 #include <media/stagefright/foundation/ABuffer.h>