commit eabb5621dd67a159500c7a35eaa2f7999004c004
author Chris Craik <ccraik@google.com> Tue Apr 04 17:16:33 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 04 17:16:43 2017 +0000
tree 2f5fe08e6bd54ff8b8adbccf3da6c5f7990068b2
parent 2ac969827115c1b8bc86d9017eb1c7c1d5421b10
parent 817b4947397dc01d0c066ae847a3efd0e4a84a24

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

Android.mk

diff --git a/Android.mk b/Android.mk
index f1db6b7..ee7d471 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1460,8 +1460,7 @@
 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)

libs/hwui/hwui_static_deps.mk

diff --git a/libs/hwui/hwui_static_deps.mk b/libs/hwui/hwui_static_deps.mk
index 7f06421..8826cfc 100644
--- a/libs/hwui/hwui_static_deps.mk
+++ b/libs/hwui/hwui_static_deps.mk
@@ -27,5 +27,7 @@
     libft2 \
     libminikin \
     libandroidfw \
-    libRScpp \
+    libRScpp
+
+LOCAL_STATIC_LIBRARIES += \
     libplatformprotos