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

Commit 6e673abe authored by Ray Essick's avatar Ray Essick
Browse files

remove use of include_dirs 

replace include_dirs with static_libs, shared_libs, or header_libs.
Dropped several sets of headers were completely unused.

Bug: 201944383
Test: build
Change-Id: If7de97fc43509351da557f32497b3f52db21c1dc
parent f5a15874

cmds/screenrecord/Android.bp

+0 −6
Original line number Diff line number Diff line
@@ -55,12 +55,6 @@ cc_binary { 
        "libGLESv2",

    ],



    include_dirs: [

        "frameworks/av/media/libstagefright",

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

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

    ],



    cflags: [

        "-Werror",

        "-Wall",

media/libstagefright/colorconversion/Android.bp

+1 −4
Original line number Diff line number Diff line
@@ -25,10 +25,6 @@ cc_library_static { 
        "SoftwareRenderer.cpp",

    ],



    include_dirs: [

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

    ],



    shared_libs: [

        "libui",

        "libnativewindow",
@@ -37,6 +33,7 @@ cc_library_static { 
    header_libs: [

        "libstagefright_headers",

        "libstagefright_foundation_headers",

        "media_plugin_headers",

    ],



    static_libs: ["libyuv_static"],

media/libstagefright/filters/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -22,10 +22,6 @@ cc_library_static { 
        "ZeroFilter.cpp",

    ],



    include_dirs: [

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

    ],



    cflags: [

        "-Wno-multichar",

        "-Werror",

media/libstagefright/foundation/Android.bp

+1 −6
Original line number Diff line number Diff line
@@ -33,18 +33,13 @@ cc_defaults { 
    },

    host_supported: true,

    double_loadable: true,

    include_dirs: [

        "frameworks/av/include",

        "frameworks/native/include",

        "frameworks/native/libs/arect/include",

        "frameworks/native/libs/nativebase/include",

    ],



    local_include_dirs: [

        "include/media/stagefright/foundation",

    ],



    header_libs: [

        "av-headers",

        // this is only needed for the vendor variant that removes libbinder, but vendor

        // target below does not allow adding header_libs.

        "libbinder_headers",

media/libstagefright/foundation/tests/AVCUtils/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -43,10 +43,6 @@ cc_test { 
        "libstagefright_foundation",

    ],



    include_dirs: [

        "frameworks/av/media/libstagefright/foundation",

    ],



    cflags: [

        "-Werror",

        "-Wall",