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

Commit 99d4d118 authored by Lajos Molnar's avatar Lajos Molnar
Browse files

codec2: move static libcodec2_vndk dependencies into a default 

Bug: 179301660
Change-Id: Ibb4dad3a9bb1332f88254dd935f9669ea5c25144
parent 34493f12

media/codec2/components/tests/Android.bp

+1 −32
Original line number Diff line number Diff line
@@ -9,44 +9,13 @@ package { 


cc_defaults {

    name: "C2SoftCodecTest-defaults",

    defaults: [ "libcodec2-static-defaults" ],

    gtest: true,

    host_supported: false,

    srcs: [

        "C2SoftCodecTest.cpp",

    ],



    static_libs: [

        "liblog",

        "libion",

        "libfmq",

        "libbase",

        "libutils",

        "libcutils",

        "libcodec2",

        "libhidlbase",

        "libdmabufheap",

        "libcodec2_vndk",

        "libnativewindow",

        "libcodec2_soft_common",

        "libsfplugin_ccodec_utils",

        "libstagefright_foundation",

        "libstagefright_bufferpool@2.0.1",

        "android.hardware.graphics.mapper@2.0",

        "android.hardware.graphics.mapper@3.0",

        "android.hardware.media.bufferpool@2.0",

        "android.hardware.graphics.allocator@2.0",

        "android.hardware.graphics.allocator@3.0",

        "android.hardware.graphics.bufferqueue@2.0",

    ],



    shared_libs: [

        "libui",

        "libdl",

        "libhardware",

        "libvndksupport",

        "libprocessgroup",

    ],



    cflags: [

        "-Wall",

        "-Werror",

media/codec2/fuzzer/Android.bp

+2 −33
Original line number Diff line number Diff line
@@ -28,43 +28,12 @@ package { 
cc_defaults {

    name: "C2Fuzzer-defaults",



    defaults: [ "libcodec2-static-defaults" ],



    srcs: [

        "C2Fuzzer.cpp",

    ],



    static_libs: [

        "liblog",

        "libion",

        "libfmq",

        "libbase",

        "libutils",

        "libcutils",

        "libcodec2",

        "libhidlbase",

        "libdmabufheap",

        "libcodec2_vndk",

        "libnativewindow",

        "libcodec2_soft_common",

        "libsfplugin_ccodec_utils",

        "libstagefright_foundation",

        "libstagefright_bufferpool@2.0.1",

        "android.hardware.graphics.mapper@2.0",

        "android.hardware.graphics.mapper@3.0",

        "android.hardware.media.bufferpool@2.0",

        "android.hardware.graphics.allocator@2.0",

        "android.hardware.graphics.allocator@3.0",

        "android.hardware.graphics.bufferqueue@2.0",

    ],



    shared_libs: [

        "libui",

        "libdl",

        "libbinder",

        "libhardware",

        "libvndksupport",

        "libprocessgroup",

    ],



    cflags: [

        "-Wall",

        "-Werror",

media/codec2/vndk/Android.bp

+38 −0
Original line number Diff line number Diff line
@@ -93,6 +93,44 @@ cc_library { 
    ],

}



// public dependency for statically linking to libcodec2_vndk for unit tests

cc_defaults {

    name: "libcodec2-static-defaults",



    static_libs: [

        "liblog",

        "libion",

        "libfmq",

        "libbase",

        "libutils",

        "libcutils",

        "libcodec2",

        "libhidlbase",

        "libdmabufheap",

        "libcodec2_vndk",

        "libnativewindow",

        "libcodec2_soft_common",

        "libsfplugin_ccodec_utils",

        "libstagefright_foundation",

        "libstagefright_bufferpool@2.0.1",

        "libgralloctypes",

        "android.hardware.graphics.mapper@2.0",

        "android.hardware.graphics.mapper@3.0",

        "android.hardware.media.bufferpool@2.0",

        "android.hardware.graphics.allocator@2.0",

        "android.hardware.graphics.allocator@3.0",

        "android.hardware.graphics.bufferqueue@2.0",

    ],



    shared_libs: [

        "libui",

        "libdl",

        "libhardware",

        "libvndksupport",

        "libprocessgroup",

    ],

}



// public dependency for implementing Codec 2 components

cc_defaults {

    name: "libcodec2-impl-defaults",