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

Commit 271a786d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "codec2: make codec2_vndk a shared library"

parents 23a0e169 75781446

media/libstagefright/codec2/Android.bp

+1 −9
Original line number Diff line number Diff line
@@ -45,24 +45,16 @@ cc_library_shared { 
    srcs: ["SimpleC2Component.cpp"],



    include_dirs: [

        "frameworks/av/media/libstagefright/codec2/include",

    ],



    shared_libs: [

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

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

        "libhidlbase",

        "libion",

        "liblog",

        "libstagefright_codec2",

        "libstagefright_codec2_vndk",

        "libstagefright_foundation",

	"libutils",

    ],



    static_libs: [

        "libstagefright_codec2_vndk",

    ],



    sanitize: {

        misc_undefined: [

            "unsigned-integer-overflow",

media/libstagefright/codec2/tests/Android.bp

+2 −18
Original line number Diff line number Diff line
@@ -42,23 +42,14 @@ cc_test { 
    ],



    include_dirs: [

        "frameworks/av/media/libstagefright/codec2/include",

        "frameworks/av/media/libstagefright/codec2/vndk/include",

    ],



    shared_libs: [

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

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

        "libcutils",

        "libhidlbase",

        "libion",

        "liblog",

        "libstagefright_codec2",

        "libutils",

    ],



    static_libs: [

        "libstagefright_codec2_vndk",

        "libutils",

    ],



    cflags: [
@@ -80,22 +71,15 @@ cc_test { 
    ],



    include_dirs: [

        "frameworks/av/media/libstagefright/codec2/include",

        "frameworks/av/media/libstagefright/codec2/vndk/include",

        "frameworks/native/include/media/openmax",

    ],



    shared_libs: [

        "libcutils",

        "libhidlbase",

        "libion",

        "liblog",

        "libstagefright_codec2",

        "libutils",

    ],



    static_libs: [

        "libstagefright_codec2_vndk",

        "libutils",

    ],



    cflags: [

media/libstagefright/codec2/vndk/Android.bp

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

cc_library {

    name: "libstagefright_codec2_vndk",



    srcs: [

media/libstagefright/codecs/avcdec/Android.bp

+2 −8
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ cc_library_shared { 


    static_libs: [

        "libavcdec",

        "libstagefright_codec2_vndk",

    ],

    srcs: ["C2SoftAvcDec.cpp"],
@@ -58,21 +57,16 @@ cc_library_shared { 
    include_dirs: [

        "external/libavc/decoder",

        "external/libavc/common",

        "frameworks/av/media/libstagefright/codec2/include",

        "frameworks/av/media/libstagefright/codec2/vndk/include",

    ],



    shared_libs: [

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

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

        "libhidlbase",

        "libion",

        "liblog",

        "libutils",

        "libmedia",

        "libstagefright_codec2",

        "libstagefright_codec2_vndk",

        "libstagefright_foundation",

        "libstagefright_simple_c2component",

        "libutils",

    ],



    sanitize: {

media/libstagefright/codecs/cmds/Android.bp

+1 −10
Original line number Diff line number Diff line
@@ -6,30 +6,21 @@ cc_binary { 
    ],



    include_dirs: [

        "frameworks/av/media/libstagefright/codec2/include",

        "frameworks/av/media/libstagefright/codec2/vndk/include",

    ],



    shared_libs: [

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

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

        "libbinder",

        "libcutils",

        "libgui",

        "libhidlbase",

        "libion",

        "liblog",

        "libstagefright",

        "libstagefright_codec2",

        "libstagefright_codec2_vndk",

        "libstagefright_foundation",

        "libui",

        "libutils",

    ],



    static_libs: [

        "libstagefright_codec2_vndk",

    ],



    cflags: [

        "-Werror",

        "-Wall",