AudioEffects: Build static libaudiopreprocessing
Test: build AudioPreProcessingTest and test on device
Test: atest preprocessing_benchmark
Bug: 181670517
Change-Id: I5e051c510ab3f0bcb83dfbe7cdff0e16133c8747
diff --git a/media/libeffects/preprocessing/Android.bp b/media/libeffects/preprocessing/Android.bp
index e46a136..eb3ce34 100644
--- a/media/libeffects/preprocessing/Android.bp
+++ b/media/libeffects/preprocessing/Android.bp
@@ -18,7 +18,7 @@
],
}
-cc_library_shared {
+cc_library {
name: "libaudiopreprocessing",
vendor: true,
relative_install_path: "soundfx",
diff --git a/media/libeffects/preprocessing/benchmarks/Android.bp b/media/libeffects/preprocessing/benchmarks/Android.bp
index 246d14e..c1b2295 100644
--- a/media/libeffects/preprocessing/benchmarks/Android.bp
+++ b/media/libeffects/preprocessing/benchmarks/Android.bp
@@ -12,14 +12,16 @@
cc_benchmark {
name: "preprocessing_benchmark",
vendor: true,
- relative_install_path: "soundfx",
srcs: ["preprocessing_benchmark.cpp"],
shared_libs: [
- "libaudiopreprocessing",
"libaudioutils",
"liblog",
"libutils",
],
+ static_libs: [
+ "libaudiopreprocessing",
+ "webrtc_audio_processing",
+ ],
cflags: [
"-DWEBRTC_POSIX",
"-fvisibility=default",
diff --git a/media/libeffects/preprocessing/tests/Android.bp b/media/libeffects/preprocessing/tests/Android.bp
index cfa6559..8848e79 100644
--- a/media/libeffects/preprocessing/tests/Android.bp
+++ b/media/libeffects/preprocessing/tests/Android.bp
@@ -12,19 +12,17 @@
cc_test {
name: "AudioPreProcessingTest",
-
vendor: true,
-
- relative_install_path: "soundfx",
-
srcs: ["PreProcessingTest.cpp"],
-
shared_libs: [
- "libaudiopreprocessing",
"libaudioutils",
"liblog",
"libutils",
],
+ static_libs: [
+ "libaudiopreprocessing",
+ "webrtc_audio_processing",
+ ],
header_libs: [
"libaudioeffects",
"libhardware_headers",