From 1ba10c48608f37e129a25acd5876c08881ff6d91 Mon Sep 17 00:00:00 2001 From: Marco Nelissen Date: Wed, 22 Apr 2020 15:41:43 -0700 Subject: [PATCH] Use the non-jet version of libsonivox Bug: 151448144 Test: build Change-Id: I132a1c8b0cab1a979c5b26bb561660dff9e4b282 --- media/extractors/midi/Android.bp | 2 +- media/extractors/tests/Android.bp | 2 +- media/libmedia/Android.bp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/media/extractors/midi/Android.bp b/media/extractors/midi/Android.bp index bdb724b7e8..b8255fc39b 100644 --- a/media/extractors/midi/Android.bp +++ b/media/extractors/midi/Android.bp @@ -10,7 +10,7 @@ cc_library { static_libs: [ "libmedia_midiiowrapper", - "libsonivox", + "libsonivoxwithoutjet", "libstagefright_foundation", "libwatchdog", ], diff --git a/media/extractors/tests/Android.bp b/media/extractors/tests/Android.bp index fa39b646d3..b3afe2f3ca 100644 --- a/media/extractors/tests/Android.bp +++ b/media/extractors/tests/Android.bp @@ -45,7 +45,7 @@ cc_test { "libstagefright_metadatautils", "libmedia_midiiowrapper", - "libsonivox", + "libsonivoxwithoutjet", "libvorbisidec", "libwebm", "libFLAC", diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp index 62a86e78b8..be3f995905 100644 --- a/media/libmedia/Android.bp +++ b/media/libmedia/Android.bp @@ -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", ],