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

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

Merge "move include_dirs to header_libs, declare apex accessibility"

parents cfa6136b ef519d74

media/codec2/components/aom/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -22,8 +22,4 @@ cc_library { 


    srcs: ["C2SoftAomDec.cpp"],

    static_libs: ["libaom"],



    include_dirs: [

        "external/libaom/",

    ],

}

media/codec2/components/avc/Android.bp

+0 −10
Original line number Diff line number Diff line
@@ -18,11 +18,6 @@ cc_library { 
    static_libs: ["libavcdec"],



    srcs: ["C2SoftAvcDec.cpp"],



    include_dirs: [

        "external/libavc/decoder",

        "external/libavc/common",

    ],

}



cc_library {
@@ -37,11 +32,6 @@ cc_library { 


    srcs: ["C2SoftAvcEnc.cpp"],



    include_dirs: [

        "external/libavc/encoder",

        "external/libavc/common",

    ],



    cflags: [

        "-Wno-unused-variable",

    ],

media/codec2/components/base/Android.bp

+12 −0
Original line number Diff line number Diff line
@@ -34,6 +34,12 @@ cc_library { 
        "libstagefright_foundation", // for Mutexed

    ],



    min_sdk_version: "29",

    apex_available: [

        "//apex_available:platform",

        "com.android.media.swcodec",

    ],



    sanitize: {

        misc_undefined: [

            "unsigned-integer-overflow",
@@ -75,6 +81,12 @@ cc_defaults { 
    ],



    ldflags: ["-Wl,-Bsymbolic"],



    min_sdk_version: "29",

    apex_available: [

        "//apex_available:platform",

        "com.android.media.swcodec",

    ],

}



// public dependency for software codec implementation

media/codec2/components/cmds/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -15,9 +15,6 @@ cc_binary { 
        "codec2.cpp",

    ],



    include_dirs: [

    ],



    header_libs: [

        "libmediadrm_headers",

    ],

media/codec2/components/gav1/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -22,4 +22,10 @@ cc_library { 


    srcs: ["C2SoftGav1Dec.cpp"],

    static_libs: ["libgav1"],



    apex_available: [

        "//apex_available:platform",

        "com.android.media.swcodec",

    ],



}