Merge "libaudiopreprocessing: Define and use cc_defaults" (04f88e7b) · Commits · e / os / android_frameworks_av

media/libeffects/preprocessing/Android.bp

+12 −8

Original line number	Diff line number	Diff line
		@@ -18,15 +18,10 @@ license {
		],
		}

		cc_library {
		name: "libaudiopreprocessing",
		cc_defaults {
		name: "libaudiopreprocessing-defaults",
		vendor: true,
		relative_install_path: "soundfx",
		host_supported: true,
		srcs: ["PreProcessing.cpp"],
		local_include_dirs: [
		".",
		],
		cflags: [
		"-Wall",
		"-Werror",
		@@ -46,7 +41,6 @@ cc_library {
		header_libs: [
		"libaudioeffects",
		"libhardware_headers",
		"libwebrtc_absl_headers",
		],
		target: {
		darwin: {
		@@ -54,3 +48,13 @@ cc_library {
		},
		},
		}

		cc_library {
		name: "libaudiopreprocessing",
		defaults: ["libaudiopreprocessing-defaults"],
		relative_install_path: "soundfx",
		srcs: ["PreProcessing.cpp"],
		header_libs: [
		"libwebrtc_absl_headers",
		],
		}

+2 −19

Original line number	Diff line number	Diff line
		@@ -11,27 +11,10 @@ package {

		cc_benchmark {
		name: "preprocessing_benchmark",
		vendor: true,
		defaults: ["libaudiopreprocessing-defaults"],
		srcs: ["preprocessing_benchmark.cpp"],
		shared_libs: [
		"libaudioutils",
		"liblog",
		"libutils",
		],
		static_libs: [
		"libaudiopreprocessing",
		"webrtc_audio_processing",
		],
		cflags: [
		"-DWEBRTC_POSIX",
		"-fvisibility=default",
		"-Wall",
		"-Werror",
		"-Wextra",
		],
		header_libs: [
		"libaudioeffects",
		"libhardware_headers",
		"libwebrtc_absl_headers",
		"libaudioutils",
		],
		}

+3 −32

Original line number	Diff line number	Diff line
		@@ -12,9 +12,8 @@ package {

		cc_test {
		name: "EffectPreprocessingTest",
		vendor: true,
		defaults: ["libaudiopreprocessing-defaults"],
		gtest: true,
		host_supported: true,
		test_suites: ["device-tests"],
		srcs: [
		"EffectPreprocessingTest.cpp",
		@@ -23,46 +22,18 @@ cc_test {
		static_libs: [
		"libaudiopreprocessing",
		"libaudioutils",
		"webrtc_audio_processing",
		],
		shared_libs: [
		"liblog",
		],
		header_libs: [
		"libaudioeffects",
		"libhardware_headers",
		],
		target: {
		darwin: {
		enabled: false,
		},
		},
		}

		cc_test {
		name: "AudioPreProcessingTest",
		vendor: true,
		host_supported: true,
		defaults: ["libaudiopreprocessing-defaults"],
		gtest: false,
		srcs: ["PreProcessingTest.cpp"],
		shared_libs: [
		"libaudioutils",
		"liblog",
		"libutils",
		],
		static_libs: [
		"libaudiopreprocessing",
		"webrtc_audio_processing",
		],
		header_libs: [
		"libaudioeffects",
		"libhardware_headers",
		"libaudioutils",
		],
		target: {
		darwin: {
		enabled: false,
		},
		},
		}

		cc_test {