OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5beefa6) | patch
Remove libtextclassifier from local shared libraries.
authorColin Cross <ccross@android.com>
Tue, 21 Mar 2017 17:59:07 +0000 (10:59 -0700)
committerColin Cross <ccross@android.com>
Tue, 21 Mar 2017 17:59:07 +0000 (10:59 -0700)
commit9d937df36ac07c517dd80b076c5c43d450e16774
treeed77de75a0aa2950ee508057e3ba5f45f65cd2d0tree | snapshot
parent5beefa697aeca3eeaeeac50f781908657490e211commit | diff
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 | blob | history
core/jni/Android.mk diff | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help