Merge "frameworks/av: Fix audio Android.bp files" into main (b2eedcbc) · Commits · e / os / android_frameworks_av

media/audioaidlconversion/Android.bp

+6 −6

Original line number	Diff line number	Diff line
		@@ -58,10 +58,10 @@ cc_library_headers {
		cc_defaults {
		name: "audio_aidl_conversion_common_default_cpp",
		shared_libs: [
		"framework-permission-aidl-cpp",
		"libbinder",
		"libshmemcompat",
		"shared-file-region-aidl-cpp",
		"framework-permission-aidl-cpp",
		],
		export_shared_lib_headers: [
		"shared-file-region-aidl-cpp",
		@@ -94,8 +94,8 @@ cc_defaults {
		],
		sanitize: {
		misc_undefined: [
		"unsigned-integer-overflow",
		"signed-integer-overflow",
		"unsigned-integer-overflow",
		],
		},
		target: {
		@@ -148,8 +148,8 @@ cc_library {
		"latest_android_media_audio_common_types_ndk_shared",
		],
		shared_libs: [
		"libbinder_ndk",
		"libbase",
		"libbinder_ndk",
		],
		static_libs: [
		"libaudioaidlcommon",
		@@ -182,8 +182,8 @@ cc_library {
		],
		shared_libs: [
		"libaudio_aidl_conversion_common_ndk",
		"libbinder_ndk",
		"libbase",
		"libbinder_ndk",
		],
		cflags: [
		"-DBACKEND_NDK",
		@@ -213,8 +213,8 @@ cc_library {
		],
		shared_libs: [
		"libaudio_aidl_conversion_common_ndk",
		"libbinder_ndk",
		"libbase",
		"libbinder_ndk",
		],
		cflags: [
		"-DBACKEND_NDK",
		@@ -238,8 +238,8 @@ cc_library {
		"latest_android_media_audio_common_types_ndk_shared",
		],
		shared_libs: [
		"libbinder_ndk",
		"libbase",
		"libbinder_ndk",
		],
		cflags: [
		"-DBACKEND_CPP_NDK",

media/audioaidlconversion/tests/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,8 +16,8 @@ cc_defaults {
		],
		sanitize: {
		misc_undefined: [
		"unsigned-integer-overflow",
		"signed-integer-overflow",
		"unsigned-integer-overflow",
		],
		},
		}
		@@ -26,8 +26,8 @@ cc_test {
		name: "audio_aidl_ndk_conversion_tests",

		defaults: [
		"latest_android_media_audio_common_types_ndk_static",
		"latest_android_hardware_audio_common_ndk_static",
		"latest_android_media_audio_common_types_ndk_static",
		"libaudio_aidl_conversion_tests_defaults",
		],
		srcs: ["audio_aidl_ndk_conversion_tests.cpp"],

media/audioserver/Android.bp

+2 −3

Original line number	Diff line number	Diff line
		@@ -26,11 +26,11 @@ cc_binary {
		],

		defaults: [
		"latest_android_hardware_audio_core_sounddose_ndk_shared",
		"latest_android_media_audio_common_types_cpp_shared",
		"libaaudioservice_dependencies",
		"libaudioflinger_dependencies",
		"libaudiopolicyservice_dependencies",
		"latest_android_media_audio_common_types_cpp_shared",
		"latest_android_hardware_audio_core_sounddose_ndk_shared",
		],

		static_libs: [
		@@ -71,7 +71,6 @@ cc_binary {
		"frameworks/av/services/medialog",
		"frameworks/av/services/oboeservice", // TODO oboeservice is the old folder name for aaudioservice. It will be changed.


		],

		init_rc: ["audioserver.rc"],

media/libaaudio/fuzzer/Android.bp

+19 −19

Original line number	Diff line number	Diff line
		@@ -35,37 +35,37 @@ cc_fuzz {
		"libaaudio_headers",
		],
		shared_libs: [
		"libbinder",
		"com.android.media.aaudio-aconfig-cc",
		"libaudio_aidl_conversion_common_cpp",
		"libaudioclient_aidl_conversion",
		"libaudiomanager",
		"libaudiopolicy",
		"libaudioclient_aidl_conversion",
		"libaudio_aidl_conversion_common_cpp",
		"libbinder",
		"libutils",
		"com.android.media.aaudio-aconfig-cc",
		],
		static_libs: [
		"liblog",
		"libcutils",
		"aaudio-aidl-cpp",
		"audioclient-types-aidl-cpp",
		"audioflinger-aidl-cpp",
		"audiopolicy-aidl-cpp",
		"audiopolicy-types-aidl-cpp",
		"av-types-aidl-cpp",
		"framework-permission-aidl-cpp",
		"libaaudio",
		"libjsoncpp",
		"libaaudio_internal",
		"libaudioclient",
		"libaudioutils",
		"libbase_ndk",
		"libcgrouprc",
		"libaudioutils",
		"libaudioclient",
		"aaudio-aidl-cpp",
		"libcgrouprc_format",
		"libcutils",
		"libjsoncpp",
		"liblog",
		"libmedia_helper",
		"libmediametrics",
		"libprocessgroup",
		"av-types-aidl-cpp",
		"libaaudio_internal",
		"libcgrouprc_format",
		"audiopolicy-aidl-cpp",
		"audioflinger-aidl-cpp",
		"audiopolicy-types-aidl-cpp",
		"audioclient-types-aidl-cpp",
		"shared-file-region-aidl-cpp",
		"framework-permission-aidl-cpp",
		"mediametricsservice-aidl-cpp",
		"shared-file-region-aidl-cpp",
		],
		fuzz_config: {
		cc: [

media/libaaudio/src/Android.bp

+49 −48

Original line number	Diff line number	Diff line
		@@ -56,10 +56,10 @@ tidy_errors = [
		"-bugprone-macro-parentheses", // found in SharedMemoryParcelable.h
		"-bugprone-narrowing-conversions", // found in several interface from size_t to int32_t

		"-google-readability-casting", // C++ casts not always necessary and may be verbose
		"-google-readability-todo", // do not require TODO(info)
		"-google-build-using-namespace", // Reenable and fix later.
		"-google-global-names-in-headers", // found in several files
		"-google-readability-casting", // C++ casts not always necessary and may be verbose
		"-google-readability-todo", // do not require TODO(info)

		"-misc-non-private-member-variables-in-classes", // found in aidl generated files

		@@ -89,28 +89,30 @@ cc_library {
		],

		cflags: [
		"-Wthread-safety",
		"-Wno-unused-parameter",
		"-Wall",
		"-Werror",
		// By default, all symbols are hidden.

		// "-fvisibility=hidden",
		// AAUDIO_API is used to explicitly export a function or a variable as a visible symbol.
		"-Wno-unused-parameter",
		"-Wthread-safety",

		"-DAAUDIO_API=__attribute__((visibility(\"default\")))",
		],

		shared_libs: [
		"framework-permission-aidl-cpp",
		"libaaudio_internal",
		"libaudioclient",
		"libaudioutils",
		"libbinder",
		"libcutils",
		"liblog",
		"libmedia_helper",
		"libmediametrics",
		"libmediautils",
		"liblog",
		"libcutils",
		"libutils",
		"libbinder",
		"framework-permission-aidl-cpp",
		],

		sanitize: {
		@@ -128,7 +130,7 @@ cc_library {
		tidy_checks_as_errors: tidy_errors,
		tidy_flags: [
		"-format-style=file",
		]
		],
		}

		cc_library {
		@@ -160,56 +162,49 @@ cc_library {
		],

		shared_libs: [
		"aaudio-aidl-cpp",
		"audioclient-types-aidl-cpp",
		"com.android.media.aaudio-aconfig-cc",
		"framework-permission-aidl-cpp",
		"libaudioclient",
		"libaudioclient_aidl_conversion",
		"libaudioutils",
		"libbinder",
		"libcutils",
		"liblog",
		"libmedia_helper",
		"libmediametrics",
		"libmediautils",
		"liblog",
		"libcutils",
		"libutils",
		"libbinder",
		"framework-permission-aidl-cpp",
		"aaudio-aidl-cpp",
		"audioclient-types-aidl-cpp",
		"libaudioclient_aidl_conversion",
		"com.android.media.aaudio-aconfig-cc",
		],

		cflags: [
		"-Wno-unused-parameter",
		"-Wall",
		"-Werror",
		"-Wno-unused-parameter",
		],

		srcs: [
		"core/AudioGlobal.cpp",
		"core/AudioStream.cpp",
		"core/AudioStreamBuilder.cpp",
		"core/AAudioStreamParameters.cpp",
		"legacy/AudioStreamLegacy.cpp",
		"legacy/AudioStreamRecord.cpp",
		"legacy/AudioStreamTrack.cpp",
		"utility/AAudioUtilities.cpp",
		"utility/FixedBlockAdapter.cpp",
		"utility/FixedBlockReader.cpp",
		"utility/FixedBlockWriter.cpp",
		"fifo/FifoBuffer.cpp",
		"fifo/FifoControllerBase.cpp",
		"client/AAudioFlowGraph.cpp",
		"client/AudioEndpoint.cpp",
		"client/AudioStreamInternal.cpp",
		"client/AudioStreamInternalCapture.cpp",
		"client/AudioStreamInternalPlay.cpp",
		"client/IsochronousClockModel.cpp",
		"binding/AudioEndpointParcelable.cpp",
		"binding/AAudioBinderAdapter.cpp",
		"binding/AAudioBinderClient.cpp",
		"binding/AAudioStreamRequest.cpp",
		"binding/AAudioStreamConfiguration.cpp",
		"binding/AAudioStreamRequest.cpp",
		"binding/AudioEndpointParcelable.cpp",
		"binding/RingBufferParcelable.cpp",
		"binding/SharedMemoryParcelable.cpp",
		"binding/SharedRegionParcelable.cpp",
		"client/AAudioFlowGraph.cpp",
		"client/AudioEndpoint.cpp",
		"client/AudioStreamInternal.cpp",
		"client/AudioStreamInternalCapture.cpp",
		"client/AudioStreamInternalPlay.cpp",
		"client/IsochronousClockModel.cpp",
		"core/AAudioStreamParameters.cpp",
		"core/AudioGlobal.cpp",
		"core/AudioStream.cpp",
		"core/AudioStreamBuilder.cpp",
		"fifo/FifoBuffer.cpp",
		"fifo/FifoControllerBase.cpp",
		"flowgraph/ChannelCountConverter.cpp",
		"flowgraph/ClipToRange.cpp",
		"flowgraph/FlowGraphNode.cpp",
		@@ -217,20 +212,20 @@ cc_library {
		"flowgraph/ManyToMultiConverter.cpp",
		"flowgraph/MonoBlend.cpp",
		"flowgraph/MonoToMultiConverter.cpp",
		"flowgraph/MultiToMonoConverter.cpp",
		"flowgraph/MultiToManyConverter.cpp",
		"flowgraph/MultiToMonoConverter.cpp",
		"flowgraph/RampLinear.cpp",
		"flowgraph/SampleRateConverter.cpp",
		"flowgraph/SinkFloat.cpp",
		"flowgraph/SinkI8_24.cpp",
		"flowgraph/SinkI16.cpp",
		"flowgraph/SinkI24.cpp",
		"flowgraph/SinkI32.cpp",
		"flowgraph/SinkI8_24.cpp",
		"flowgraph/SourceFloat.cpp",
		"flowgraph/SourceI8_24.cpp",
		"flowgraph/SourceI16.cpp",
		"flowgraph/SourceI24.cpp",
		"flowgraph/SourceI32.cpp",
		"flowgraph/SourceI8_24.cpp",
		"flowgraph/resampler/IntegerRatio.cpp",
		"flowgraph/resampler/LinearResampler.cpp",
		"flowgraph/resampler/MultiChannelResampler.cpp",
		@@ -239,6 +234,13 @@ cc_library {
		"flowgraph/resampler/PolyphaseResamplerStereo.cpp",
		"flowgraph/resampler/SincResampler.cpp",
		"flowgraph/resampler/SincResamplerStereo.cpp",
		"legacy/AudioStreamLegacy.cpp",
		"legacy/AudioStreamRecord.cpp",
		"legacy/AudioStreamTrack.cpp",
		"utility/AAudioUtilities.cpp",
		"utility/FixedBlockAdapter.cpp",
		"utility/FixedBlockReader.cpp",
		"utility/FixedBlockWriter.cpp",
		],
		sanitize: {
		integer_overflow: true,
		@@ -250,7 +252,7 @@ cc_library {
		tidy_checks_as_errors: tidy_errors,
		tidy_flags: [
		"-format-style=file",
		]
		],
		}

		aidl_interface {
		@@ -262,20 +264,19 @@ aidl_interface {
		],
		srcs: [
		"binding/aidl/aaudio/Endpoint.aidl",
		"binding/aidl/aaudio/IAAudioClient.aidl",
		"binding/aidl/aaudio/IAAudioService.aidl",
		"binding/aidl/aaudio/RingBuffer.aidl",
		"binding/aidl/aaudio/SharedRegion.aidl",
		"binding/aidl/aaudio/StreamParameters.aidl",
		"binding/aidl/aaudio/StreamRequest.aidl",
		"binding/aidl/aaudio/IAAudioClient.aidl",
		"binding/aidl/aaudio/IAAudioService.aidl",
		],
		imports: [
		"audioclient-types-aidl",
		"shared-file-region-aidl",
		"framework-permission-aidl",
		"shared-file-region-aidl",
		],
		backend:
		{
		backend: {
		java: {
		sdk_version: "module_current",
		},