diff --git a/Android.mk b/Android.mk
index b46aeb891008d..304298f1a61a2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -570,6 +570,9 @@ LOCAL_STATIC_JAVA_LIBRARIES :=                          \
     android.hardware.usb@1.0-java-constants             \
     android.hardware.vibrator@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 af5fca2c0e429..95b2593201e63 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -286,7 +286,6 @@ LOCAL_SHARED_LIBRARIES := \
     libhwbinder \
     libvintf \
     libnativewindow \
-    libtextclassifier \
 
 LOCAL_SHARED_LIBRARIES += \
     libhwui \