Remove libmediadrm symlinks

Test: build
Change-Id: I53d703b6d34226926437b0207a2b3d51dff6881a
Merged-In: I53d703b6d34226926437b0207a2b3d51dff6881a

cmds/screenrecord/Android.bp

@@ -24,6 +24,10 @@ cc_binary {
         "Program.cpp",
     ],
 
+    header_libs: [
+        "libmediadrm_headers",
+    ],
+
     shared_libs: [
         "libstagefright",
         "libmedia",

cmds/screenrecord/screenrecord.cpp

@@ -52,7 +52,7 @@
 #include <media/stagefright/MediaErrors.h>
 #include <media/stagefright/MediaMuxer.h>
 #include <media/stagefright/PersistentSurface.h>
-#include <media/ICrypto.h>
+#include <mediadrm/ICrypto.h>
 #include <media/MediaCodecBuffer.h>
 
 #include "screenrecord.h"

cmds/stagefright/Android.mk

@@ -133,6 +133,9 @@ LOCAL_SRC_FILES:=               \
         codec.cpp               \
         SimplePlayer.cpp        \
 
+LOCAL_HEADER_LIBRARIES := \
+        libmediadrm_headers \
+
 LOCAL_SHARED_LIBRARIES := \
         libstagefright liblog libutils libbinder libstagefright_foundation \
         libmedia libmedia_omx libaudioclient libui libgui libcutils
@@ -159,17 +162,18 @@ LOCAL_SRC_FILES:= \
         filters/saturation.rscript \
         mediafilter.cpp \
 
+LOCAL_HEADER_LIBRARIES := \
+        libmediadrm_headers \
+
 LOCAL_SHARED_LIBRARIES := \
         libstagefright \
         liblog \
         libutils \
         libbinder \
         libstagefright_foundation \
-        libmedia \
         libmedia_omx \
         libui \
         libgui \
-        libcutils \
         libRScpp \
 
 LOCAL_C_INCLUDES:= \

cmds/stagefright/SimplePlayer.cpp

@@ -23,7 +23,7 @@
 #include <gui/Surface.h>
 
 #include <media/AudioTrack.h>
-#include <media/ICrypto.h>
+#include <mediadrm/ICrypto.h>
 #include <media/IMediaHTTPService.h>
 #include <media/MediaCodecBuffer.h>
 #include <media/stagefright/foundation/ABuffer.h>

cmds/stagefright/codec.cpp

@@ -23,7 +23,7 @@
 
 #include <binder/IServiceManager.h>
 #include <binder/ProcessState.h>
-#include <media/ICrypto.h>
+#include <mediadrm/ICrypto.h>
 #include <media/IMediaHTTPService.h>
 #include <media/IMediaPlayerService.h>
 #include <media/MediaCodecBuffer.h>

cmds/stagefright/mediafilter.cpp

@@ -24,9 +24,9 @@
 #include <gui/ISurfaceComposer.h>
 #include <gui/SurfaceComposerClient.h>
 #include <gui/Surface.h>
-#include <media/ICrypto.h>
 #include <media/IMediaHTTPService.h>
 #include <media/MediaCodecBuffer.h>
+#include <mediadrm/ICrypto.h>
 #include <media/stagefright/foundation/ABuffer.h>
 #include <media/stagefright/foundation/ADebug.h>
 #include <media/stagefright/foundation/AMessage.h>

cmds/stagefright/stagefright.cpp

@@ -33,7 +33,6 @@
 #include <binder/ProcessState.h>
 #include <media/DataSource.h>
 #include <media/MediaSource.h>
-#include <media/ICrypto.h>
 #include <media/IMediaHTTPService.h>
 #include <media/IMediaPlayerService.h>
 #include <media/stagefright/foundation/ABuffer.h>

drm/libmediadrm/Android.bp

@@ -2,6 +2,15 @@
 // libmediadrm
 //
 
+cc_library_headers {
+    name: "libmediadrm_headers",
+
+    export_include_dirs: [
+        "interface"
+    ],
+
+}
+
 cc_library_shared {
     name: "libmediadrm",
 
@@ -17,6 +26,15 @@ cc_library_shared {
         "CryptoHal.cpp",
     ],
 
+    local_include_dirs: [
+        "include",
+        "interface"
+    ],
+
+    export_include_dirs: [
+        "include"
+    ],
+
     shared_libs: [
         "libbinder",
         "libcutils",
@@ -49,6 +67,10 @@ cc_library_shared {
         "protos/metrics.proto",
     ],
 
+    local_include_dirs: [
+        "include"
+    ],
+
     proto: {
         export_proto_headers: true,
         type: "lite",
@@ -80,6 +102,10 @@ cc_library_shared {
         "protos/metrics.proto",
     ],
 
+    local_include_dirs: [
+        "include"
+    ],
+
     proto: {
         export_proto_headers: true,
         type: "full",

drm/libmediadrm/tests/Android.bp

@@ -28,6 +28,7 @@ cc_test {
     ],
     static_libs: ["libgmock"],
     include_dirs: [
+      "frameworks/av/drm/libmediadrm/include",
       "frameworks/av/include/media",
     ],
     cflags: [

include/mediadrm/CryptoHal.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/CryptoHal.h

include/mediadrm/DrmHal.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/DrmHal.h

include/mediadrm/DrmMetrics.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/DrmMetrics.h

include/mediadrm/DrmPluginPath.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/DrmPluginPath.h

include/mediadrm/DrmSessionClientInterface.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/DrmSessionClientInterface.h

include/mediadrm/DrmSessionManager.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/DrmSessionManager.h

include/mediadrm/ICrypto.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/ICrypto.h

include/mediadrm/IDrm.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/IDrm.h

include/mediadrm/IDrmClient.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/IDrmClient.h

include/mediadrm/IMediaDrmService.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/IMediaDrmService.h

include/mediadrm/SharedLibrary.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/SharedLibrary.h

media/codec2/components/cmds/Android.bp

@@ -9,6 +9,10 @@ cc_binary {
     include_dirs: [
     ],
 
+    header_libs: [
+        "libmediadrm_headers",
+    ],
+
     shared_libs: [
         "libbase",
         "libbinder",

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>

media/codec2/sfplugin/Android.bp

@@ -22,6 +22,7 @@ cc_library_shared {
 
     header_libs: [
         "libcodec2_internal",
+        "libmediadrm_headers",
     ],
 
     shared_libs: [

media/codec2/sfplugin/CCodecBufferChannel.h

@@ -29,7 +29,6 @@
 #include <codec2/hidl/client.h>
 #include <media/stagefright/foundation/Mutexed.h>
 #include <media/stagefright/CodecBase.h>
-#include <media/ICrypto.h>
 
 #include "CCodecBuffers.h"
 #include "InputSurfaceWrapper.h"

media/codec2/sfplugin/Codec2Buffer.h

@@ -25,7 +25,7 @@
 #include <media/hardware/VideoAPI.h>
 #include <media/stagefright/foundation/ABuffer.h>
 #include <media/MediaCodecBuffer.h>
-#include <media/ICrypto.h>
+#include <mediadrm/ICrypto.h>
 
 namespace android {
 

media/codec2/sfplugin/tests/Android.bp

@@ -33,6 +33,10 @@ cc_test {
         "frameworks/av/media/codec2/sfplugin",
     ],
 
+    header_libs: [
+        "libmediadrm_headers",
+    ],
+
     shared_libs: [
         "libbinder",
         "libcodec2",

media/codec2/sfplugin/tests/MediaCodec_sanity_test.cpp

@@ -21,7 +21,7 @@
 #include <binder/ProcessState.h>
 #include <gtest/gtest.h>
 #include <gui/Surface.h>
-#include <media/ICrypto.h>
+#include <mediadrm/ICrypto.h>
 #include <media/MediaCodecBuffer.h>
 #include <media/hardware/VideoAPI.h>
 #include <media/stagefright/MediaCodec.h>

media/libmediaplayerservice/nuplayer/Android.bp

@@ -18,6 +18,7 @@ cc_library_static {
     ],
 
     header_libs: [
+        "libmediadrm_headers",
         "media_plugin_headers",
     ],
 

media/libmediaplayerservice/nuplayer/NuPlayer.h

@@ -19,7 +19,7 @@
 #define NU_PLAYER_H_
 
 #include <media/AudioResamplerPublic.h>
-#include <media/ICrypto.h>
+#include <mediadrm/ICrypto.h>
 #include <media/MediaPlayerInterface.h>
 #include <media/stagefright/foundation/AHandler.h>
 

media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp

@@ -28,7 +28,7 @@
 #include "NuPlayerSource.h"
 
 #include <cutils/properties.h>
-#include <media/ICrypto.h>
+#include <mediadrm/ICrypto.h>
 #include <media/MediaBufferHolder.h>
 #include <media/MediaCodecBuffer.h>
 #include <media/stagefright/foundation/ABuffer.h>

media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp

@@ -24,7 +24,7 @@
 #include "NuPlayerRenderer.h"
 #include "NuPlayerSource.h"
 
-#include <media/ICrypto.h>
+#include <mediadrm/ICrypto.h>
 #include <media/MediaCodecBuffer.h>
 #include <media/stagefright/foundation/ABuffer.h>
 #include <media/stagefright/foundation/ADebug.h>

media/libmediaplayerservice/nuplayer/NuPlayerDrm.h

@@ -18,8 +18,8 @@
 #define NUPLAYER_DRM_H_
 
 #include <binder/Parcel.h>
-#include <media/ICrypto.h>
+#include <mediadrm/ICrypto.h>
-#include <media/IDrm.h>
+#include <mediadrm/IDrm.h>
 #include <media/stagefright/MetaData.h> // for CryptInfo
 
 

media/libmediaplayerservice/nuplayer/NuPlayerSource.h

@@ -20,7 +20,7 @@
 
 #include "NuPlayer.h"
 
-#include <media/ICrypto.h>
+#include <mediadrm/ICrypto.h>
 #include <media/mediaplayer.h>
 #include <media/stagefright/foundation/AMessage.h>
 #include <media/stagefright/MetaData.h>

media/libstagefright/Android.bp

@@ -58,6 +58,10 @@ cc_library_shared {
         "-Wall",
     ],
 
+    header_libs: [
+        "libmediadrm_headers",
+    ],
+
     shared_libs: [
         "libgui",
         "liblog",
@@ -220,6 +224,7 @@ cc_library {
     ],
 
     header_libs:[
+        "libmediadrm_headers",
         "libnativeloader-headers",
         "libstagefright_xmlparser_headers",
         "media_ndk_headers",

media/libstagefright/BufferImpl.cpp

@@ -21,7 +21,7 @@
 #include <binder/IMemory.h>
 #include <media/stagefright/foundation/ABuffer.h>
 #include <media/stagefright/foundation/AMessage.h>
-#include <media/ICrypto.h>
+#include <mediadrm/ICrypto.h>
 #include <utils/NativeHandle.h>
 
 #include "include/SecureBuffer.h"

media/libstagefright/CodecBase.cpp

@@ -18,7 +18,7 @@
 #define LOG_TAG "CodecBase"
 
 #include <android/hardware/cas/native/1.0/IDescrambler.h>
-#include <media/ICrypto.h>
+#include <mediadrm/ICrypto.h>
 #include <media/stagefright/CodecBase.h>
 #include <utils/Log.h>
 

media/libstagefright/FrameDecoder.cpp

@@ -22,7 +22,7 @@
 #include <binder/MemoryHeapBase.h>
 #include <gui/Surface.h>
 #include <inttypes.h>
-#include <media/ICrypto.h>
+#include <mediadrm/ICrypto.h>
 #include <media/IMediaSource.h>
 #include <media/MediaCodecBuffer.h>
 #include <media/stagefright/foundation/avc_utils.h>

media/libstagefright/MediaCodec.cpp

@@ -35,7 +35,7 @@
 #include <cutils/properties.h>
 #include <gui/BufferQueue.h>
 #include <gui/Surface.h>
-#include <media/ICrypto.h>
+#include <mediadrm/ICrypto.h>
 #include <media/IOMX.h>
 #include <media/IResourceManagerService.h>
 #include <media/MediaCodecBuffer.h>

media/libstagefright/MediaCodecListOverrides.cpp

@@ -22,7 +22,7 @@
 
 #include <cutils/properties.h>
 #include <gui/Surface.h>
-#include <media/ICrypto.h>
+#include <mediadrm/ICrypto.h>
 #include <media/IMediaCodecList.h>
 #include <media/MediaCodecInfo.h>
 #include <media/MediaResourcePolicy.h>

media/libstagefright/MediaCodecSource.cpp

@@ -22,7 +22,7 @@
 
 #include <gui/IGraphicBufferProducer.h>
 #include <gui/Surface.h>
-#include <media/ICrypto.h>
+#include <mediadrm/ICrypto.h>
 #include <media/MediaBufferHolder.h>
 #include <media/MediaCodecBuffer.h>
 #include <media/MediaSource.h>

media/libstagefright/SimpleDecodingSource.cpp

@@ -20,7 +20,7 @@
 
 #include <gui/Surface.h>
 
-#include <media/ICrypto.h>
+#include <mediadrm/ICrypto.h>
 #include <media/MediaCodecBuffer.h>
 #include <media/stagefright/MediaDefs.h>
 #include <media/stagefright/foundation/ALooper.h>

media/libstagefright/filters/Android.bp

@@ -23,6 +23,10 @@ cc_library_static {
         "-Wall",
     ],
 
+    header_libs: [
+        "libmediadrm_headers",
+    ],
+
     shared_libs: [
         "libgui",
         "libmedia",

media/libstagefright/include/ACodecBufferChannel.h

@@ -25,7 +25,7 @@
 
 #include <media/openmax/OMX_Types.h>
 #include <media/stagefright/CodecBase.h>
-#include <media/ICrypto.h>
+#include <mediadrm/ICrypto.h>
 #include <media/IOMX.h>
 
 namespace android {

media/libstagefright/include/SecureBuffer.h

@@ -18,7 +18,7 @@
 
 #define SECURE_BUFFER_H_
 
-#include <media/ICrypto.h>
+#include <mediadrm/ICrypto.h>
 #include <media/MediaCodecBuffer.h>
 
 namespace android {

media/ndk/Android.bp

@@ -69,6 +69,10 @@ cc_library_shared {
         "libgrallocusage",
     ],
 
+    header_libs: [
+        "libmediadrm_headers",
+    ],
+
     shared_libs: [
         "android.hardware.graphics.bufferqueue@1.0",
         "android.hidl.token@1.0-utils",
@@ -76,9 +80,9 @@ cc_library_shared {
         "libbase",
         "libbinder",
         "libmedia",
+        "libmediadrm",
         "libmedia_omx",
         "libmedia_jni_utils",
-        "libmediadrm",
         "libstagefright",
         "libstagefright_foundation",
         "liblog",

media/ndk/NdkMediaCrypto.cpp

@@ -27,8 +27,8 @@
 #include <utils/Log.h>
 #include <utils/StrongPointer.h>
 #include <binder/IServiceManager.h>
-#include <media/ICrypto.h>
+#include <mediadrm/ICrypto.h>
-#include <media/IMediaDrmService.h>
+#include <mediadrm/IMediaDrmService.h>
 #include <android_util_Binder.h>
 
 #include <jni.h>

media/ndk/NdkMediaCryptoPriv.h

@@ -30,7 +30,7 @@
 
 #include <sys/types.h>
 #include <utils/StrongPointer.h>
-#include <media/ICrypto.h>
+#include <mediadrm/ICrypto.h>
 
 using namespace android;
 

media/ndk/NdkMediaDrm.cpp

@@ -29,12 +29,12 @@
 
 #include <android-base/properties.h>
 #include <binder/PermissionController.h>
-#include <media/IDrm.h>
+#include <mediadrm/IDrm.h>
-#include <media/IDrmClient.h>
+#include <mediadrm/IDrmClient.h>
 #include <media/stagefright/MediaErrors.h>
 #include <binder/IServiceManager.h>
-#include <media/IMediaDrmService.h>
 #include <media/NdkMediaCrypto.h>
+#include <mediadrm/IMediaDrmService.h>
 
 
 using namespace android;

services/camera/libcameraservice/Android.bp

@@ -69,6 +69,10 @@ cc_library_shared {
         "utils/LatencyHistogram.cpp",
     ],
 
+    header_libs: [
+        "libmediadrm_headers"
+    ],
+
     shared_libs: [
         "libbase",
         "libdl",

services/camera/libcameraservice/api2/HeicCompositeStream.cpp

@@ -28,7 +28,7 @@
 #include <utils/Log.h>
 #include <utils/Trace.h>
 
-#include <media/ICrypto.h>
+#include <mediadrm/ICrypto.h>
 #include <media/MediaCodecBuffer.h>
 #include <media/stagefright/foundation/ABuffer.h>
 #include <media/stagefright/foundation/AMessage.h>

services/mediadrm/Android.mk

@@ -20,6 +20,9 @@ LOCAL_SRC_FILES:= \
     MediaDrmService.cpp \
     main_mediadrmserver.cpp
 
+LOCAL_HEADER_LIBRARIES:= \
+    libmediadrm_headers
+
 LOCAL_SHARED_LIBRARIES:= \
     libbinder \
     liblog \