Merge "Remove libtextclassifier from local shared libraries."

2017-03-21 20:49:12 +00:00
parent 7ba04df38c 9d937df36a
commit c79d4388de
2 changed files with 3 additions and 1 deletions
--- 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
--- 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 \