Fix additional UnsatisfiedLinkError for CtsSecurityTest
libaudiohal was added in master, of which libnbaio apparently
started to depend on. Also added libaudioeffects to the list
of additional shared library dependency to avoid
java.lang.UnsatisfiedLinkError from reoccuring.
Test: cts-tradefed run collect-tests-only -m CtsSecurityTestCases
--skip-device-info --skip-preconditions --skip-connectivity-check
All tests passed!
(cherry picked from commit 5a01c278e88c4ddb7b72e38e3ffe28d40203d6ad)
Bug: 31938338
Bug: 34454188
Test: No more linker errors when running CTS tests
Change-Id: I06bcf78e5a93998b3bcc1ef5e028d9046726ebcd
Merged-In: I91123a640c2fba7157d51de899d5c39ce3d3d9d2
(cherry picked from commit f4e5b394ca6be014a2dec37103dd8bda8c7fd5a4)
diff --git a/tests/tests/security/Android.mk b/tests/tests/security/Android.mk
index f2b4470..67c04f61 100644
--- a/tests/tests/security/Android.mk
+++ b/tests/tests/security/Android.mk
@@ -41,6 +41,7 @@
libcamera_client \
libgui \
libaudioutils \
+ libaudiohal \
libnbaio \
libpcre \
libpackagelistparser \
@@ -52,7 +53,8 @@
libcamera_metadata \
libspeexresampler \
liblzma \
- libstagefright_foundation
+ libstagefright_foundation \
+ libeffects
LOCAL_SRC_FILES := $(call all-java-files-under, src)\
src/android/security/cts/activity/ISecureRandomService.aidl\
diff --git a/tests/tests/security/jni/Android.mk b/tests/tests/security/jni/Android.mk
index d39ac7e..fc4edb3 100644
--- a/tests/tests/security/jni/Android.mk
+++ b/tests/tests/security/jni/Android.mk
@@ -50,6 +50,7 @@
libcamera_client \
libgui \
libaudioutils \
+ libaudiohal \
libnbaio \
libpcre \
libpackagelistparser \
@@ -61,7 +62,8 @@
libcamera_metadata \
libspeexresampler \
liblzma \
- libstagefright_foundation
+ libstagefright_foundation \
+ libeffects
LOCAL_C_INCLUDES += ndk/sources/cpufeatures
LOCAL_STATIC_LIBRARIES := cpufeatures
