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

Commit 064a1c38 authored by Kris Alder's avatar Kris Alder Committed by Gerrit Code Review
Browse files

Merge changes I558b2d71,I1afce18b 

* changes:
  Set min_sdk_version to be part of mainline modules
  Remove extractor-defaults_no-sanitizer
parents 9c1b2c30 23d39986

media/extractors/Android.bp

+4 −7
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
// limitations under the License.



cc_defaults {

    name: "extractor-defaults_no-sanitizer",

    name: "extractor-defaults",



    include_dirs: [

        "frameworks/av/media/libstagefright/include",
@@ -24,6 +24,9 @@ cc_defaults { 
        "libmediandk#29",

    ],



    // extractors are supposed to work on Q(29)

    min_sdk_version: "29",



    relative_install_path: "extractors",



    compile_multilib: "first",
@@ -35,12 +38,6 @@ cc_defaults { 
    ],



    version_script: "exports.lds",

}



cc_defaults {

    name: "extractor-defaults",



    defaults: ["extractor-defaults_no-sanitizer"],



    sanitize: {

        cfi: true,

media/extractors/mp4/Android.bp

+3 −24
Original line number Diff line number Diff line 
cc_defaults {

    name: "libmp4extractor_defaults",

    defaults: ["extractor-defaults_no-sanitizer"],

cc_library {

    name: "libmp4extractor",

    defaults: ["extractor-defaults"],



    srcs: [

        "AC4Parser.cpp",
@@ -17,24 +17,3 @@ cc_defaults { 
        "libutils",

    ],

}
 


cc_library {



    name: "libmp4extractor",

    defaults: ["libmp4extractor_defaults"],



    sanitize: {

        cfi: true,

        misc_undefined: [

            "unsigned-integer-overflow",

            "signed-integer-overflow",

        ],

    },



}



cc_library_static {

    name: "libmp4extractor_fuzzing",



    defaults: ["libmp4extractor_defaults"],

}

media/libstagefright/codecs/amrnb/common/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ cc_library { 
    name: "libstagefright_amrnb_common",

    vendor_available: true,

    host_supported: true,

    min_sdk_version: "29",



    srcs: [

        "src/add.cpp",

media/libstagefright/codecs/amrnb/dec/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ cc_library_static { 
    name: "libstagefright_amrnbdec",

    vendor_available: true,

    host_supported: true,

    min_sdk_version: "29",



    srcs: [

        "src/a_refl.cpp",

media/libstagefright/codecs/amrnb/enc/Android.bp

+1 −0
Original line number Diff line number Diff line 
cc_library_static {

    name: "libstagefright_amrnbenc",

    vendor_available: true,

    min_sdk_version: "29",



    srcs: [

        "src/amrencode.cpp",