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

Commit 25690483 authored by Harish Mahendrakar's avatar Harish Mahendrakar Committed by android-build-merger
Browse files

Merge "Change libvpx to shared library" into qt-dev am: c1d77e97 

am: b2007812

Change-Id: I5ceb56559c0bd64dcf7b0753239e048b9e6a3843
parents 928a24e8 b2007812

media/codec2/components/vpx/Android.bp

+4 −4
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ cc_library_shared { 




    srcs: ["C2SoftVpxDec.cpp"],

    srcs: ["C2SoftVpxDec.cpp"],





    static_libs: ["libvpx"],

    shared_libs: ["libvpx"],





    cflags: [

    cflags: [

        "-DVP9",

        "-DVP9",
@@ -23,7 +23,7 @@ cc_library_shared { 




    srcs: ["C2SoftVpxDec.cpp"],

    srcs: ["C2SoftVpxDec.cpp"],





    static_libs: ["libvpx"],

    shared_libs: ["libvpx"],

}

}





cc_library_shared {

cc_library_shared {
@@ -38,7 +38,7 @@ cc_library_shared { 
        "C2SoftVpxEnc.cpp",

        "C2SoftVpxEnc.cpp",

    ],

    ],





    static_libs: ["libvpx"],

    shared_libs: ["libvpx"],





    cflags: ["-DVP9"],

    cflags: ["-DVP9"],

}

}
@@ -55,6 +55,6 @@ cc_library_shared { 
        "C2SoftVpxEnc.cpp",

        "C2SoftVpxEnc.cpp",

    ],

    ],





    static_libs: ["libvpx"],

    shared_libs: ["libvpx"],

}

}

media/libstagefright/Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -212,7 +212,6 @@ cc_library { 
        "libstagefright_mediafilter",

        "libstagefright_mediafilter",

        "libstagefright_webm",

        "libstagefright_webm",

        "libstagefright_timedtext",

        "libstagefright_timedtext",

        "libvpx",

        "libogg",

        "libogg",

        "libwebm",

        "libwebm",

        "libstagefright_esds",

        "libstagefright_esds",

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ cc_library_shared { 




    srcs: ["SoftVPX.cpp"],

    srcs: ["SoftVPX.cpp"],





    static_libs: ["libvpx"],

    shared_libs: ["libvpx"],





    version_script: "exports.lds",

    version_script: "exports.lds",

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,5 +20,5 @@ cc_library_shared { 
        cfi: true,

        cfi: true,

    },

    },





    static_libs: ["libvpx"],

    shared_libs: ["libvpx"],

}
 
}