Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch libplatformproto to sharedlib

Browse Source 
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
This commit is contained in:
John Reck
2017-03-29 18:41:27 -07:00
parent d686e9c26e
commit e5549d414c
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Android.mk
View File

@@ -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)

4
libs/hwui/hwui_static_deps.mk
View File

@@ -27,7 +27,5 @@ LOCAL_SHARED_LIBRARIES += \
libft2 \
libminikin \
libandroidfw \
libRScpp
LOCAL_STATIC_LIBRARIES += \
libRScpp \
libplatformprotos