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

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

Merge "Cleaning out media references in include_dirs"

parents d21f3585 8fc402ab

media/libmediaplayerservice/datasource/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ cc_library_static { 
    ],



    header_libs: [

        "media_ndk_headers",

        "libmedia_headers",

    ],

media/libstagefright/omx/tests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ cc_test { 
    header_libs: [

        "libbase_headers",

        "libmediametrics_headers",

        "media_ndk_headers",

    ],



    cflags: [

media/libstagefright/webm/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ cc_library_static { 
    header_libs: [

        "av-headers",

        "libmedia_headers",

        "media_ndk_headers",

    ],

}

media/ndk/Android.bp

+5 −2
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ ndk_headers { 
}



// for use with header_libs

// supports use as <media/NdkMediaExtractor.h> not <NdkMediaExtractor.h>

cc_library_headers {

    name: "media_ndk_headers",

    vendor_available: true,
@@ -103,8 +104,6 @@ cc_library_shared { 
    ],



    include_dirs: [

        "frameworks/base/core/jni",

        "frameworks/native/include/media/openmax",

        "system/media/camera/include",

    ],
@@ -178,6 +177,9 @@ cc_library { 
        "NdkMediaDataSourceCallbacks.cpp",

    ],



    local_include_dirs: [

        "include",

    ],



    export_include_dirs: [

        "include",
@@ -192,6 +194,7 @@ cc_library { 
    header_libs: [

        "libstagefright_headers",

        "libmedia_headers",

        "libstagefright_headers",

    ],



    shared_libs: [

services/camera/libcameraservice/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ cc_library_shared { 
    include_dirs: [

        "system/media/private/camera/include",

        "frameworks/native/include/media/openmax",

        "frameworks/av/media/ndk",

        "external/dynamic_depth/includes",

        "external/dynamic_depth/internal",

    ],