commit bb2add3503b233d335ee781476f935520ba0b011
author Tony Mak <tonymak@google.com> Mon Oct 19 22:37:01 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 19 22:37:01 2020 +0000
tree 6948f16e56830e22d51efb2a4e3d042520efba9b
parent f630dd85b0eebce5421a34110c22ababc05aa9eb
parent 6f5446d49a583456b0fa17cbd2f2eb78369043c4

[automerger skipped] Export a fix that fixes an issue that the entity type is missing for translate action chip am: 6f5446d49a -s ours

am skip reason: Change-Id I2007c55451f3ad146ba8892f9e0eb4cae5a01750 with SHA-1 5ef9338a81 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libtextclassifier/+/12875739

Change-Id: Ic33ec26df9c00532a87e1004cdfe2e0f2f34a102

native/Android.bp

diff --git a/native/Android.bp b/native/Android.bp
index b120565..442eb63 100644
--- a/native/Android.bp
+++ b/native/Android.bp
@@ -100,6 +100,7 @@
     },
 
     header_libs: [
+        "jni_headers",
         "tensorflow_headers",
         "flatbuffer_headers",
         "libtextclassifier_flatbuffer_headers",
@@ -111,6 +112,7 @@
     ],
 
     static_libs: [
+        "marisa-trie",
         "liblua",
         "libutf",
         "libtflite_static",
@@ -202,8 +204,6 @@
     ],
 
     compile_multilib: "prefer32",
-
-    sdk_variant_only: true
 }
 
 // ------------------------------------