diff --git a/Android.mk b/Android.mk
index 03b2533..783fa6b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -569,6 +569,9 @@
     android.hardware.health@1.0-java-constants          \
     android.hardware.usb@1.0-java-constants             \
 
+# Loaded with System.loadLibrary by android.view.textclassifier
+LOCAL_REQUIRED_MODULES += libtextclassifier
+
 LOCAL_PROTOC_OPTIMIZE_TYPE := stream
 LOCAL_PROTOC_FLAGS := \
     -Iexternal/protobuf/src
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index af5fca2..95b25932 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -286,7 +286,6 @@
     libhwbinder \
     libvintf \
     libnativewindow \
-    libtextclassifier \
 
 LOCAL_SHARED_LIBRARIES += \
     libhwui \