commit f38e292436a9f9dfa89edca2a00ba809c8360cf5
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 22 18:39:05 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 22 18:39:05 2020 +0000
tree 254444f4ca8cab17b3624043c0816f5ad74a7d65
parent 68d4086add4d4eb51cf8459c75a6c16f60c58122
parent d5cad8bd55716abf4013d38c403591cf13114af2

Merge "Ship the v710 models to the system image" into rvc-dev am: 667ce51be7 am: d5cad8bd55

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

Change-Id: I319bf5e559da5311352cc9f01840fab841600b9c

METADATA

diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+  license_type: NOTICE
+}

native/Android.bp

diff --git a/native/Android.bp b/native/Android.bp
index 9a79285..fdb2446 100644
--- a/native/Android.bp
+++ b/native/Android.bp
@@ -122,19 +122,20 @@
     ],
 
     header_libs: [
+        "jni_headers",
         "tensorflow_headers",
         "flatbuffer_headers",
     ],
 
     shared_libs: [
         "liblog",
+        "libz",
     ],
 
     static_libs: [
         "liblua",
         "libutf",
         "libtflite_static",
-        "libz_current",
     ],
 }
 
@@ -332,6 +333,8 @@
 
     srcs: ["**/*.cc"],
 
+    header_libs: ["jni_headers"],
+
     static_libs: [
         "libgmock_ndk",
         "libgtest_ndk_c++",