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

2017-04-04 17:16:33 +00:00
parent 2ac9698271 817b494739
commit eabb5621dd
2 changed files with 4 additions and 3 deletions
--- a/Android.mk
+++ b/Android.mk
@@ -1460,8 +1460,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