commit 9d937df36ac07c517dd80b076c5c43d450e16774
author Colin Cross <ccross@android.com> Tue Mar 21 10:59:07 2017 -0700
committer Colin Cross <ccross@android.com> Tue Mar 21 10:59:07 2017 -0700
tree ed77de75a0aa2950ee508057e3ba5f45f65cd2d0
parent 5beefa697aeca3eeaeeac50f781908657490e211

Remove libtextclassifier from local shared libraries.

Move libtextclassifier from LOCAL_SHARED_LIBRARIES to
LOCAL_REQUIRED_MODULES so that it is still installed to the
system image but not linked against libandroid_runtime.  Avoids
ODR issues between libprotobuf-cpp-lite and libprotobuf-cpp-full.

Test: Checked that libtextclassifier is still built into the system image
      but not linked to libandroid_runtime.
Bug: 36350884
Change-Id: I6e57b4323a84c14e05f1b9e463ce93625d9cb3d7

Android.mk

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