From 817b4947397dc01d0c066ae847a3efd0e4a84a24 Mon Sep 17 00:00:00 2001
From: Chris Craik <ccraik@google.com>
Date: Mon, 3 Apr 2017 21:46:44 +0000
Subject: [PATCH] Revert "Switch libplatformproto to sharedlib"

Bug:36847782

This reverts commit e5549d414c7231ee0037cf413dad17e28b8905ba.

Change-Id: I38f1c501b7e40be11ba5f0a7a50651e0c3e41fc5
---
 Android.mk                    | 3 +--
 libs/hwui/hwui_static_deps.mk | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Android.mk b/Android.mk
index eb649c9152c3c..8daab8ff800e4 100644
--- 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)
diff --git a/libs/hwui/hwui_static_deps.mk b/libs/hwui/hwui_static_deps.mk
index 7f06421b02a02..8826cfcc31005 100644
--- 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