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

Commit 0d630638 authored by Kris Alder's avatar Kris Alder Committed by Automerger Merge Worker
Browse files

Merge changes I8097e8e0,I07e1dd05,If5059c6c am: f74535d0 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1305241

Change-Id: Ie516ab523186e75d4af10c257e243f1e945dfd0e
parents 933cbc51 f74535d0

media/extractors/Android.bp

+15 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ cc_defaults { 


    shared_libs: [

        "liblog",

        "libmediandk#29",

    ],



    // extractors are supposed to work on Q(29)
@@ -39,6 +38,21 @@ cc_defaults { 


    version_script: "exports.lds",



    target: {

        android: {

            shared_libs: [

                "libmediandk#29",

            ],

        },

        host: {

            static_libs: [

                "libutils",

                "libmediandk_format",

                "libmedia_ndkformatpriv",

            ],

        },

    },



    sanitize: {

        cfi: true,

        misc_undefined: [

media/extractors/fuzzers/Android.bp

+8 −2
Original line number Diff line number Diff line
@@ -71,10 +71,15 @@ cc_fuzz { 
        "frameworks/av/media/extractors/mp4",

    ],



    header_libs: [

        "libaudioclient_headers",

    ],



    static_libs: [

        "liblog",

        "libstagefright_foundation",

        "libmedia",

        "libmediandk_format",

        "libmedia_ndkformatpriv",

        "libextractorfuzzerbase",

        "libstagefright_id3",

        "libstagefright_esds",
@@ -83,7 +88,6 @@ cc_fuzz { 


    shared_libs: [

        "libutils",

        "libmediandk",

        "libbinder",

    ],
@@ -95,6 +99,8 @@ cc_fuzz { 
        ],

        componentid: 155276,

    },



    host_supported: true,

}



cc_fuzz {

media/extractors/mp4/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -16,4 +16,12 @@ cc_library { 
        "libstagefright_id3",

        "libutils",

    ],



    host_supported: true,



    target: {

        darwin: {

            enabled: false,

        },

    },

}