summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
author John Reck <jreck@google.com> 2017-03-29 18:41:27 -0700
committer John Reck <jreck@google.com> 2017-03-29 18:41:27 -0700
commite5549d414c7231ee0037cf413dad17e28b8905ba (patch)
treefdbfe410b13038c91eec5e69dbfd3491ce5d1030 /libs
parentd686e9c26e84e56810fcf87f6002ba8ba2b3f0c5 (diff)
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
Diffstat (limited to 'libs')
-rw-r--r--libs/hwui/hwui_static_deps.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/libs/hwui/hwui_static_deps.mk b/libs/hwui/hwui_static_deps.mk
index 8826cfcc3100..7f06421b02a0 100644
--- a/libs/hwui/hwui_static_deps.mk
+++ b/libs/hwui/hwui_static_deps.mk
@@ -27,7 +27,5 @@ LOCAL_SHARED_LIBRARIES += \
libft2 \
libminikin \
libandroidfw \
- libRScpp
-
-LOCAL_STATIC_LIBRARIES += \
+ libRScpp \
libplatformprotos