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

Commit c1736135 authored by Devin Moore's avatar Devin Moore Committed by Gerrit Code Review
Browse files

Merge "Add runtime codec libs to fuzzer" into main

parents 0369b4ac 88cc0d4c

media/codec2/hal/aidl/Android.bp

+1 −5
Original line number Diff line number Diff line
@@ -165,14 +165,10 @@ cc_fuzz { 
    defaults: [

        "libcodec2-aidl-defaults",

        "service_fuzzer_defaults",

        "libcodec2-runtime-libs",

    ],

    shared_libs: [

        "libcodec2_vndk",



        "libcodec2_soft_avcdec",

        "libcodec2_soft_avcenc",

        "libcodec2_soft_aacdec",

        "libcodec2_soft_aacenc",

    ],

    fuzz_config: {

        cc: [

media/module/codecserviceregistrant/Android.bp

+33 −28
Original line number Diff line number Diff line
@@ -6,34 +6,8 @@ package { 
    //   SPDX-license-identifier-Apache-2.0

}



cc_library {

    name: "libmedia_codecserviceregistrant",

    vendor_available: true,

    min_sdk_version: "29",

    apex_available: [

        "//apex_available:platform",

        "com.android.media.swcodec",

    ],



    srcs: [

        "CodecServiceRegistrant.cpp",

    ],



    header_libs: [

        "libmedia_headers",

    ],



    defaults: [

        "libcodec2-hidl-defaults",

    ],

    shared_libs: [

        "libbase",

        "libcodec2_hidl@1.0",

        "libcodec2_vndk",

        "libhidlbase",

        "libutils",

    ],



cc_defaults {

    name: "libcodec2-runtime-libs",

    // Codecs

    runtime_libs: [

        "libcodec2_soft_avcdec",
@@ -70,3 +44,34 @@ cc_library { 
        "libcodec2_soft_gsmdec",

    ],

}



cc_library {

    name: "libmedia_codecserviceregistrant",

    vendor_available: true,

    min_sdk_version: "29",

    apex_available: [

        "//apex_available:platform",

        "com.android.media.swcodec",

    ],



    srcs: [

        "CodecServiceRegistrant.cpp",

    ],



    header_libs: [

        "libmedia_headers",

    ],



    defaults: [

        "libcodec2-hidl-defaults",

        "libcodec2-runtime-libs",

    ],

    shared_libs: [

        "libbase",

        "libcodec2_hidl@1.0",

        "libcodec2_vndk",

        "libhidlbase",

        "libutils",

    ],



}