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

Commit bc9c56ab authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Link statically with libutils and libstagefright_foundation" into pi-dev 

am: 7579f05e

Change-Id: I85816e69479b1abb9325ae81a7af445a1cc6a86d
parents 34e45684 7579f05e

media/extractors/aac/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -9,12 +9,12 @@ cc_library_shared { 
    shared_libs: [

        "liblog",

        "libmediaextractor",

        "libstagefright_foundation",

        "libutils",

    ],



    static_libs: [

        "libstagefright_foundation",

        "libstagefright_metadatautils",

        "libutils",

    ],



    name: "libaacextractor",

media/extractors/amr/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ cc_library_shared { 
    shared_libs: [

        "liblog",

        "libmediaextractor",

    ],



    static_libs: [

        "libstagefright_foundation",

    ],

media/extractors/flac/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ cc_library_shared { 
    shared_libs: [

        "liblog",

        "libmediaextractor",

        "libstagefright_foundation",

    ],



    static_libs: [

        "libFLAC",

        "libstagefright_foundation",

    ],



    name: "libflacextractor",

media/extractors/midi/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -9,12 +9,12 @@ cc_library_shared { 
    shared_libs: [

        "liblog",

        "libmediaextractor",

        "libstagefright_foundation"

    ],



    static_libs: [

        "libmedia_midiiowrapper",

        "libsonivox",

        "libstagefright_foundation"

    ],

    name: "libmidiextractor",

    relative_install_path: "extractors",

media/extractors/mkv/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -12,14 +12,14 @@ cc_library_shared { 
    shared_libs: [

        "liblog",

        "libmediaextractor",

        "libstagefright_foundation",

        "libutils",

    ],



    static_libs: [

        "libstagefright_flacdec",

        "libstagefright_foundation",

        "libstagefright_metadatautils",

        "libwebm",

        "libutils",

    ],



    name: "libmkvextractor",