diff --git a/core/java/android/view/textclassifier/LangId.java b/core/java/android/view/textclassifier/LangId.java
index ada3c37c..23c7842 100644
--- a/core/java/android/view/textclassifier/LangId.java
+++ b/core/java/android/view/textclassifier/LangId.java
@@ -22,7 +22,7 @@
 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 c48cd06..9397a41 100644
--- a/core/java/android/view/textclassifier/SmartSelection.java
+++ b/core/java/android/view/textclassifier/SmartSelection.java
@@ -23,7 +23,7 @@
 final class SmartSelection {
 
     static {
-        System.loadLibrary("smart-selection_jni");
+        System.loadLibrary("textclassifier");
     }
 
     private final long mCtx;
@@ -92,4 +92,3 @@
         }
     }
 }
-
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index c9f9d6f..5665807 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -287,6 +287,7 @@
     libhwbinder \
     libvintf \
     libnativewindow \
+    libtextclassifier \
 
 LOCAL_SHARED_LIBRARIES += \
     libhwui \