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

Commit b2007812 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

Change-Id: I9668b3ffcb74ff33fadd337d35abad2e71837b61
parents 962b5106 c1d77e97

media/codec2/components/vpx/Android.bp

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


    srcs: ["C2SoftVpxDec.cpp"],



    static_libs: ["libvpx"],

    shared_libs: ["libvpx"],



    cflags: [

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


    srcs: ["C2SoftVpxDec.cpp"],



    static_libs: ["libvpx"],

    shared_libs: ["libvpx"],

}



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

    ],



    static_libs: ["libvpx"],

    shared_libs: ["libvpx"],



    cflags: ["-DVP9"],

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

    ],



    static_libs: ["libvpx"],

    shared_libs: ["libvpx"],

}

media/libstagefright/Android.bp

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

        "libstagefright_webm",

        "libstagefright_timedtext",

        "libvpx",

        "libogg",

        "libwebm",

        "libstagefright_esds",

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

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


    srcs: ["SoftVPX.cpp"],



    static_libs: ["libvpx"],

    shared_libs: ["libvpx"],



    version_script: "exports.lds",

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

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

    },



    static_libs: ["libvpx"],

    shared_libs: ["libvpx"],

}