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

Commit a16e934e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Place nuplayer headers in a subdirectory"

parents 6c5b27ac afca156a

media/libmediaplayerservice/MediaPlayerFactory.cpp

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include "MediaPlayerFactory.h"



#include "TestPlayerStub.h"

#include "nuplayer/NuPlayerDriver.h"

#include <nuplayer/NuPlayerDriver.h>



namespace android {

media/libmediaplayerservice/MediaPlayerService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ 
#include "MediaPlayerFactory.h"



#include "TestPlayerStub.h"

#include "nuplayer/NuPlayerDriver.h"

#include <nuplayer/NuPlayerDriver.h>





static const int kDumpLockRetries = 50;

media/libmediaplayerservice/nuplayer/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -37,6 +37,14 @@ cc_library_static { 
        "StreamingSource.cpp",

    ],



    local_include_dirs: [

        "include/nuplayer",

    ],



    export_include_dirs: [

        "include",

    ],



    header_libs: [

        "libmediadrm_headers",

        "libmediametrics_headers",