commit bb1e814f412fb938be0e7d6df59a3840bf357f83
author Marco Nelissen <marcone@google.com> Sat Apr 25 15:17:09 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Apr 25 15:17:09 2020 +0000
tree 30997acfd99c984a5dad92c216df0c97de790c2d
parent 6d38482257329cff6608bca4c1a711f8adc65047
parent fbd8871732d31e8bb9850ce88b0e771bcf7a45fe

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

Change-Id: I6cc9f08a714027b38312648b87a4dd71eef313fe

media/extractors/midi/Android.bp

diff --git a/media/extractors/midi/Android.bp b/media/extractors/midi/Android.bp
index bdb724b..b8255fc 100644
--- a/media/extractors/midi/Android.bp
+++ b/media/extractors/midi/Android.bp
@@ -10,7 +10,7 @@
 
     static_libs: [
         "libmedia_midiiowrapper",
-        "libsonivox",
+        "libsonivoxwithoutjet",
         "libstagefright_foundation",
         "libwatchdog",
     ],

media/extractors/tests/Android.bp

diff --git a/media/extractors/tests/Android.bp b/media/extractors/tests/Android.bp
index fa39b64..b3afe2f 100644
--- a/media/extractors/tests/Android.bp
+++ b/media/extractors/tests/Android.bp
@@ -45,7 +45,7 @@
         "libstagefright_metadatautils",
 
         "libmedia_midiiowrapper",
-        "libsonivox",
+        "libsonivoxwithoutjet",
         "libvorbisidec",
         "libwebm",
         "libFLAC",

media/libmedia/Android.bp

diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp
index 217209d..f888752 100644
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@@ -187,7 +187,7 @@
     srcs: ["MidiIoWrapper.cpp"],
 
     static_libs: [
-        "libsonivox",
+        "libsonivoxwithoutjet",
     ],
 
     header_libs: [
@@ -314,7 +314,7 @@
         "libutils",
         "libbinder",
         "libbinder_ndk",
-        "libsonivox",
+        //"libsonivox",
         "libandroidicu",
         "libexpat",
         "libcamera_client",
@@ -330,7 +330,7 @@
         "libaudioclient",
         "libbinder",
         "libandroidicu",
-        "libsonivox",
+        //"libsonivox",
         "libmedia_omx",
     ],