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

Commit e90080b3 authored by Marco Nelissen's avatar Marco Nelissen Committed by Automerger Merge Worker
Browse files

Merge "Use the non-jet version of libsonivox" into rvc-dev am: 7d46c0b6 am: fbd88717 

Change-Id: I30d233e281347a270edee666bb8bee73a75a320c
parents 7d6fb9d3 fbd88717

media/extractors/midi/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ cc_library { 


    static_libs: [

        "libmedia_midiiowrapper",

        "libsonivox",

        "libsonivoxwithoutjet",

        "libstagefright_foundation",

        "libwatchdog",

    ],

media/extractors/tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ cc_test { 
        "libstagefright_metadatautils",



        "libmedia_midiiowrapper",

        "libsonivox",

        "libsonivoxwithoutjet",

        "libvorbisidec",

        "libwebm",

        "libFLAC",

media/libmedia/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ cc_library_static { 
    srcs: ["MidiIoWrapper.cpp"],



    static_libs: [

        "libsonivox",

        "libsonivoxwithoutjet",

    ],



    header_libs: [
@@ -312,7 +312,7 @@ cc_library { 
        "libutils",

        "libbinder",

        "libbinder_ndk",

        "libsonivox",

        //"libsonivox",

        "libandroidicu",

        "libexpat",

        "libcamera_client",
@@ -328,7 +328,7 @@ cc_library { 
        "libaudioclient",

        "libbinder",

        "libandroidicu",

        "libsonivox",

        //"libsonivox",

        "libmedia_omx",

    ],