Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d937df3 authored by Colin Cross's avatar Colin Cross
Browse files

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
parent 5beefa69

Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -569,6 +569,9 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    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

core/jni/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -286,7 +286,6 @@ LOCAL_SHARED_LIBRARIES := \ 
    libhwbinder \

    libvintf \

    libnativewindow \

    libtextclassifier \



LOCAL_SHARED_LIBRARIES += \

    libhwui \