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

Commit 972761a7 authored by Ray Essick's avatar Ray Essick Committed by Android (Google) Code Review
Browse files

Merge "Replacing include_dirs with header_libs"

parents a7541bec a4a85800

media/libmediaplayerservice/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ cc_library { 
    header_libs: [

        "media_plugin_headers",

        "libmediautils_headers",

        "libstagefright_rtsp_headers",

    ],



    static_libs: [
@@ -91,7 +92,6 @@ cc_library { 
    ],



    include_dirs: [

        "frameworks/av/media/libstagefright/rtsp",

        "frameworks/av/media/libstagefright/webm",

    ],

media/libmediaplayerservice/StagefrightRecorder.cpp

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


#include <system/audio.h>



#include "ARTPWriter.h"

#include <media/stagefright/rtsp/ARTPWriter.h>



namespace android {

media/libmediaplayerservice/nuplayer/Android.bp

+2 −3
Original line number Diff line number Diff line
@@ -41,14 +41,13 @@ cc_library_static { 
        "libmediadrm_headers",

        "libmediametrics_headers",

        "media_plugin_headers",

        "libstagefright_headers",

        "libstagefright_rtsp_headers",

    ],



    include_dirs: [

        "frameworks/av/media/libstagefright",

        "frameworks/av/media/libstagefright/httplive",

        "frameworks/av/media/libstagefright/include",

        "frameworks/av/media/libstagefright/mpeg2ts",

        "frameworks/av/media/libstagefright/rtsp",

        "frameworks/av/media/libstagefright/timedtext",

        "frameworks/native/include/android",

    ],

media/libmediaplayerservice/nuplayer/RTPSource.h

+4 −4
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ 
#include <media/stagefright/foundation/ADebug.h>

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

#include <media/stagefright/MediaSource.h>

#include <media/stagefright/rtsp/APacketSource.h>

#include <media/stagefright/rtsp/ARTPConnection.h>

#include <media/stagefright/rtsp/ARTPSource.h>

#include <media/stagefright/rtsp/ASessionDescription.h>

#include <media/stagefright/Utils.h>

#include <media/BufferingSettings.h>
@@ -31,10 +35,6 @@ 
#include <utils/RefBase.h>



#include "AnotherPacketSource.h"

#include "APacketSource.h"

#include "ARTPConnection.h"

#include "ARTPSource.h"

#include "ASessionDescription.h"

#include "NuPlayerSource.h"

media/libmediaplayerservice/nuplayer/RTSPSource.cpp

+2 −2
Original line number Diff line number Diff line
@@ -21,12 +21,12 @@ 
#include "RTSPSource.h"



#include "AnotherPacketSource.h"

#include "MyHandler.h"

#include "SDPLoader.h"



#include <media/IMediaHTTPService.h>

#include <media/stagefright/MediaDefs.h>

#include <media/stagefright/MetaData.h>

#include <media/stagefright/rtsp/MyHandler.h>

#include <media/stagefright/rtsp/SDPLoader.h>



namespace android {