Merge "Revert "Switch libplatformproto to sharedlib"" into oc-dev

am: eabb5621dd Change-Id: Ie8e941bc49639d0841d6955c268069d95d450e38
2017-04-04 17:25:05 +00:00
parent 836cfa6ba2 eabb5621dd
commit f497ca5a2e
2 changed files with 4 additions and 3 deletions
--- a/Android.mk
+++ b/Android.mk
@ -1461,8 +1461,7 @@ LOCAL_PROTOC_FLAGS := \
 LOCAL_SRC_FILES := \
    $(call all-proto-files-under, core/proto) \
    $(call all-proto-files-under, libs/incident/proto)
-LOCAL_SHARED_LIBRARIES := libprotobuf-cpp-full
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)

 # ====  c++ proto host library  ==============================
 include $(CLEAR_VARS)
--- a/libs/hwui/hwui_static_deps.mk
+++ b/libs/hwui/hwui_static_deps.mk
@ -27,5 +27,7 @@ LOCAL_SHARED_LIBRARIES += \
    libft2 \
    libminikin \
    libandroidfw \
-    libRScpp \
+    libRScpp
+
+LOCAL_STATIC_LIBRARIES += \
    libplatformprotos