commit 96376c6f9e049de63fbc283685d95f30af1b0463
author Tony Mak <tonymak@google.com> Fri May 29 21:35:39 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 29 21:35:39 2020 +0000
tree 1f182d619c80835b42155acf299b3dc3dccf9b9c
parent d4b52f3f0d7b887628e1eadaac26b0237df6585b
parent a06bdc71ed0b25ded2fe366c94ebd8b3a3088654

[automerger skipped] Export libtextclassifier and make some native tests working again am: a06bdc71ed -s ours

am skip reason: Change-Id I98b25793e9644bee43f416255911d969b31d91b7 with SHA-1 d4b52f3f0d is in history

Change-Id: I2a715f92ca176601cec6f6a1730912a823588286

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 4260525..ebbd423 100644
--- a/native/Android.bp
+++ b/native/Android.bp
@@ -128,13 +128,13 @@
 
     shared_libs: [
         "liblog",
+        "libz",
     ],
 
     static_libs: [
         "liblua",
         "libutf",
         "libtflite_static",
-        "libz_current",
     ],
 }
 
@@ -332,6 +332,8 @@
 
     srcs: ["**/*.cc"],
 
+    header_libs: ["jni_headers"],
+
     static_libs: [
         "libgmock_ndk",
         "libgtest_ndk_c++",