Merge "Switch libplatformproto to sharedlib" into oc-dev

am: 72c2760943 Change-Id: I534c8d890499dbd7fbe456fa407b10e34d2a5eb3
2017-03-30 16:57:51 +00:00
parent 1f3f5955bb 72c2760943
commit af39ba5d49
2 changed files with 3 additions and 4 deletions
--- a/Android.mk
+++ b/Android.mk
@ -1461,7 +1461,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)
--- 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