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

Commit e5549d41 authored by John Reck's avatar John Reck
Browse files

Switch libplatformproto to sharedlib 

libplatformprotos is really really unhappy if it gets
loaded twice into the same process which trivially happens
if it's a static library. Switch it to a shared library
instead to fix this.

Change-Id: I90297d076d0739bab683fbd9607d7fc0884a002d
Fixes: 36272398
Test: Ran hwui_unit_test, didn't crash
parent d686e9c2

Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -1460,7 +1460,8 @@ LOCAL_PROTOC_FLAGS := \ 
LOCAL_SRC_FILES := \

    $(call all-proto-files-under, core/proto) \

    $(call all-proto-files-under, libs/incident/proto)

include $(BUILD_STATIC_LIBRARY)

LOCAL_SHARED_LIBRARIES := libprotobuf-cpp-full

include $(BUILD_SHARED_LIBRARY)



# ====  c++ proto host library  ==============================

include $(CLEAR_VARS)

libs/hwui/hwui_static_deps.mk

+1 −3
Original line number Diff line number Diff line
@@ -27,7 +27,5 @@ LOCAL_SHARED_LIBRARIES += \ 
    libft2 \

    libminikin \

    libandroidfw \

    libRScpp



LOCAL_STATIC_LIBRARIES += \

    libRScpp \

    libplatformprotos