Use static variants of libtextclassifier & libcrypto.
libneuralnetworks.so switched to library_static variants of
libtextclassifier & libcrypto, with _static suffix.
libneuralnetworks_common has to switch as well, otherwise
soong uses both libraries as dependencies.
Test: build crosshatch & flashed device.
Bug: 148593574
Change-Id: I28c948b4c43a91b8b6c52eb5d214ace799202035
diff --git a/common/Android.bp b/common/Android.bp
index c2b2064..ebc9297 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -174,14 +174,12 @@
"[email protected]",
"[email protected]",
"libbase",
- "libcrypto",
"libcutils",
"libfmq",
"libhidlbase",
"libhidlmemory",
"liblog",
"libnativewindow",
- "libtextclassifier_hash",
"libutils",
],
header_libs: [
@@ -197,7 +195,10 @@
"libtflite_kernel_utils",
"philox_random",
],
-
+ static_libs: [
+ "libcrypto_static",
+ "libtextclassifier_hash_static",
+ ],
cflags: [
"-DNAMESPACE_FOR_HASH_FUNCTIONS=farmhash",
"-DNN_INCLUDE_CPU_IMPLEMENTATION",