Make JNI build target name and usages match

This CL renames the JNI build target introduced in ag/18495086 to
`libtflite_support_classifiers_native`, using the `lib-` prefix scheme
Java expects when loading JNI libraries, and updates its usages to
match.

Test: m
Bug: 228842813
Change-Id: Ieca537703d1292b7fd7a1f62730ec691b512a3e1

4 files changed, 4 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index 41b981da..96debe5b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -213,7 +213,7 @@ java_library {
 }
 
 cc_library_shared {
-    name: "tflite_support_classifiers_native",
+    name: "libtflite_support_classifiers_native",
     srcs: [
         "tensorflow_lite_support/java/src/native/task/text/nlclassifier/bert_nlclassifier/bert_nl_classifier_jni.cc",
         "tensorflow_lite_support/java/src/native/task/text/nlclassifier/nl_classifier_jni.cc",
diff --git a/tensorflow_lite_support/java/src/java/org/tensorflow/lite/task/text/nlclassifier/BertNLClassifier.java b/tensorflow_lite_support/java/src/java/org/tensorflow/lite/task/text/nlclassifier/BertNLClassifier.java
index 90bea370..fb5e278d 100644
--- a/tensorflow_lite_support/java/src/java/org/tensorflow/lite/task/text/nlclassifier/BertNLClassifier.java
+++ b/tensorflow_lite_support/java/src/java/org/tensorflow/lite/task/text/nlclassifier/BertNLClassifier.java
@@ -42,7 +42,7 @@ import org.tensorflow.lite.task.core.TaskJniUtils.EmptyHandleProvider;
  * </ul>
  */
 public class BertNLClassifier extends BaseTaskApi {
-  private static final String BERT_NL_CLASSIFIER_NATIVE_LIBNAME = "task_text_jni";
+  private static final String BERT_NL_CLASSIFIER_NATIVE_LIBNAME = "tflite_support_classifiers_native";
 
   /**
    * Constructor to initialize the JNI with a pointer from C++.
diff --git a/tensorflow_lite_support/java/src/java/org/tensorflow/lite/task/text/nlclassifier/NLClassifier.java b/tensorflow_lite_support/java/src/java/org/tensorflow/lite/task/text/nlclassifier/NLClassifier.java
index 2bc20d8c..642fab5b 100644
--- a/tensorflow_lite_support/java/src/java/org/tensorflow/lite/task/text/nlclassifier/NLClassifier.java
+++ b/tensorflow_lite_support/java/src/java/org/tensorflow/lite/task/text/nlclassifier/NLClassifier.java
@@ -126,7 +126,7 @@ public class NLClassifier extends BaseTaskApi {
     }
   }
 
-  private static final String NL_CLASSIFIER_NATIVE_LIBNAME = "task_text_jni";
+  private static final String NL_CLASSIFIER_NATIVE_LIBNAME = "tflite_support_classifiers_native";
 
   /**
    * Constructor to initialize the JNI with a pointer from C++.
diff --git a/tensorflow_lite_support/java/src/java/org/tensorflow/lite/task/text/qa/BertQuestionAnswerer.java b/tensorflow_lite_support/java/src/java/org/tensorflow/lite/task/text/qa/BertQuestionAnswerer.java
index 76f562ef..7c019d21 100644
--- a/tensorflow_lite_support/java/src/java/org/tensorflow/lite/task/text/qa/BertQuestionAnswerer.java
+++ b/tensorflow_lite_support/java/src/java/org/tensorflow/lite/task/text/qa/BertQuestionAnswerer.java
@@ -28,7 +28,7 @@ import org.tensorflow.lite.task.core.TaskJniUtils.MultipleBuffersHandleProvider;
 
 /** Task API for BertQA models. */
 public class BertQuestionAnswerer extends BaseTaskApi implements QuestionAnswerer {
-  private static final String BERT_QUESTION_ANSWERER_NATIVE_LIBNAME = "task_text_jni";
+  private static final String BERT_QUESTION_ANSWERER_NATIVE_LIBNAME = "tflite_support_classifiers_native";
 
   private BertQuestionAnswerer(long nativeHandle) {
     super(nativeHandle);