summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Abodunrinwa Toki <toki@google.com> 2017-03-02 20:43:01 +0000
committer Abodunrinwa Toki <toki@google.com> 2017-03-11 00:20:02 +0000
commit099ff1123b94c363055a9f6779db09e848b8051a (patch)
tree9e04ae81fa53b3d2e6f60883fb75252930861790
parent61f31c7b3a2de5b4b5acedfc5a0d0fa27a03ce69 (diff)
Use the textclassifier library for smart selection
Test: cts-tradefed run cts-dev -m CtsViewTestCases -t android.view.textclassifier.cts.TextClassificationManagerTest Bug: 34780447 Change-Id: I090654f266a214cba9346f954e14d8878146e343
-rw-r--r--core/java/android/view/textclassifier/LangId.java2
-rw-r--r--core/java/android/view/textclassifier/SmartSelection.java3
-rw-r--r--core/jni/Android.mk1
3 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/view/textclassifier/LangId.java b/core/java/android/view/textclassifier/LangId.java
index ada3c37c83e9..23c7842780a9 100644
--- a/core/java/android/view/textclassifier/LangId.java
+++ b/core/java/android/view/textclassifier/LangId.java
@@ -22,7 +22,7 @@ package android.view.textclassifier;
final class LangId {
static {
- System.loadLibrary("smart-selection_jni");
+ System.loadLibrary("textclassifier");
}
private final long mModelPtr;
diff --git a/core/java/android/view/textclassifier/SmartSelection.java b/core/java/android/view/textclassifier/SmartSelection.java
index c48cd06fee0e..9397a4163e97 100644
--- a/core/java/android/view/textclassifier/SmartSelection.java
+++ b/core/java/android/view/textclassifier/SmartSelection.java
@@ -23,7 +23,7 @@ package android.view.textclassifier;
final class SmartSelection {
static {
- System.loadLibrary("smart-selection_jni");
+ System.loadLibrary("textclassifier");
}
private final long mCtx;
@@ -92,4 +92,3 @@ final class SmartSelection {
}
}
}
-
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index c9f9d6f6dfb0..56658071dd76 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -287,6 +287,7 @@ LOCAL_SHARED_LIBRARIES := \
libhwbinder \
libvintf \
libnativewindow \
+ libtextclassifier \
LOCAL_SHARED_LIBRARIES += \
libhwui \