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

Commit fbd88717 authored Apr 25, 2020 by Marco Nelissen Committed by Automerger Merge Worker Apr 25, 2020

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

Change-Id: I83e2beb1a0c44a21a700f1d78dbcfd3be4d2b199

parents 17f3f610 7d46c0b6

media/extractors/midi/Android.bp

+1 −1

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

	static_libs: [		static_libs: [
	"libmedia_midiiowrapper",		"libmedia_midiiowrapper",
	"libsonivox",		"libsonivoxwithoutjet",
	"libstagefright_foundation",		"libstagefright_foundation",
	"libwatchdog",		"libwatchdog",
	],		],

media/extractors/tests/Android.bp

+1 −1

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

	"libmedia_midiiowrapper",		"libmedia_midiiowrapper",
	"libsonivox",		"libsonivoxwithoutjet",
	"libvorbisidec",		"libvorbisidec",
	"libwebm",		"libwebm",
	"libFLAC",		"libFLAC",

media/libmedia/Android.bp

+3 −3

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

	static_libs: [		static_libs: [
	"libsonivox",		"libsonivoxwithoutjet",
	],		],

	header_libs: [		header_libs: [
	@@ -312,7 +312,7 @@ cc_library {
	"libutils",		"libutils",
	"libbinder",		"libbinder",
	"libbinder_ndk",		"libbinder_ndk",
	"libsonivox",		//"libsonivox",
	"libandroidicu",		"libandroidicu",
	"libexpat",		"libexpat",
	"libcamera_client",		"libcamera_client",
	@@ -328,7 +328,7 @@ cc_library {
	"libaudioclient",		"libaudioclient",
	"libbinder",		"libbinder",
	"libandroidicu",		"libandroidicu",
	"libsonivox",		//"libsonivox",
	"libmedia_omx",		"libmedia_omx",
	],		],