Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f0a23d0 authored by Marco Nelissen's avatar Marco Nelissen Committed by Gerrit Code Review
Browse files

Merge "Remove libmediadrm symlinks"

parents ad71d423 55b259cf

cmds/screenrecord/Android.bp

+4 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,10 @@ cc_binary { 
        "Program.cpp",

        "Program.cpp",

    ],

    ],





    header_libs: [

        "libmediadrm_headers",

    ],



    shared_libs: [

    shared_libs: [

        "libstagefright",

        "libstagefright",

        "libmedia",

        "libmedia",

cmds/screenrecord/screenrecord.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -52,7 +52,7 @@ 
#include <media/stagefright/MediaErrors.h>

#include <media/stagefright/MediaErrors.h>

#include <media/stagefright/MediaMuxer.h>

#include <media/stagefright/MediaMuxer.h>

#include <media/stagefright/PersistentSurface.h>

#include <media/stagefright/PersistentSurface.h>

#include <media/ICrypto.h>

#include <mediadrm/ICrypto.h>

#include <media/MediaCodecBuffer.h>

#include <media/MediaCodecBuffer.h>





#include "screenrecord.h"

#include "screenrecord.h"

cmds/stagefright/Android.mk

+6 −2
Original line number Original line Diff line number Diff line
@@ -133,6 +133,9 @@ LOCAL_SRC_FILES:= \ 
        codec.cpp               \

        codec.cpp               \

        SimplePlayer.cpp        \

        SimplePlayer.cpp        \





LOCAL_HEADER_LIBRARIES := \

        libmediadrm_headers \



LOCAL_SHARED_LIBRARIES := \

LOCAL_SHARED_LIBRARIES := \

        libstagefright liblog libutils libbinder libstagefright_foundation \

        libstagefright liblog libutils libbinder libstagefright_foundation \

        libmedia libmedia_omx libaudioclient libui libgui libcutils

        libmedia libmedia_omx libaudioclient libui libgui libcutils
@@ -159,17 +162,18 @@ LOCAL_SRC_FILES:= \ 
        filters/saturation.rscript \

        filters/saturation.rscript \

        mediafilter.cpp \

        mediafilter.cpp \





LOCAL_HEADER_LIBRARIES := \

        libmediadrm_headers \



LOCAL_SHARED_LIBRARIES := \

LOCAL_SHARED_LIBRARIES := \

        libstagefright \

        libstagefright \

        liblog \

        liblog \

        libutils \

        libutils \

        libbinder \

        libbinder \

        libstagefright_foundation \

        libstagefright_foundation \

        libmedia \

        libmedia_omx \

        libmedia_omx \

        libui \

        libui \

        libgui \

        libgui \

        libcutils \

        libRScpp \

        libRScpp \





LOCAL_C_INCLUDES:= \

LOCAL_C_INCLUDES:= \

cmds/stagefright/SimplePlayer.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <gui/Surface.h>

#include <gui/Surface.h>





#include <media/AudioTrack.h>

#include <media/AudioTrack.h>

#include <media/ICrypto.h>

#include <mediadrm/ICrypto.h>

#include <media/IMediaHTTPService.h>

#include <media/IMediaHTTPService.h>

#include <media/MediaCodecBuffer.h>

#include <media/MediaCodecBuffer.h>

#include <media/stagefright/foundation/ABuffer.h>

#include <media/stagefright/foundation/ABuffer.h>

cmds/stagefright/codec.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 




#include <binder/IServiceManager.h>

#include <binder/IServiceManager.h>

#include <binder/ProcessState.h>

#include <binder/ProcessState.h>

#include <media/ICrypto.h>

#include <mediadrm/ICrypto.h>

#include <media/IMediaHTTPService.h>

#include <media/IMediaHTTPService.h>

#include <media/IMediaPlayerService.h>

#include <media/IMediaPlayerService.h>

#include <media/MediaCodecBuffer.h>

#include <media/MediaCodecBuffer.h>