commit 6f62b40c2ee9f8b9affefbe48092575d56db05f2
author Andy Hung <hunga@google.com> Wed Mar 03 01:40:42 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 03 01:40:42 2021 +0000
tree cf3ccea65d549f2fabddf798de4008e64e91d839
parent 209f976f4d3af328b3d72ccaa21b2e176e2c3cdc
parent 670fb4276c68e0705852779536df6fa56eeddc98

Merge "AudioEffects: Build static libaudiopreprocessing" am: edc1fff4df am: b195c949ca am: 670fb4276c

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1613219

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If0e21635a5c29b8b59391d324bf1e79b1f9a9403

media/libeffects/preprocessing/Android.bp

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",

media/libeffects/preprocessing/benchmarks/Android.bp

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",

media/libeffects/preprocessing/tests/Android.bp

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",