commit 3c9c29ee38e6e89eb0d6861e04fb4af7fb0a2c3b
author John Reck <jreck@google.com> Thu Mar 30 17:32:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 30 17:32:00 2017 +0000
tree 35a05a5e41f803e7769499985bd99d83ed74417b
parent 0e4d38028ce64b923136149a9245cf3ee7fabedb
parent af39ba5d4982af2453d3afcfa991c69af7bb3c56

Merge "Switch libplatformproto to sharedlib" into oc-dev am: 72c2760943
am: af39ba5d49

Change-Id: I73d9035f13f83c80045004867b4470779095d603

Android.mk

diff --git a/Android.mk b/Android.mk
index e43d6f8..08ef6f5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1464,7 +1464,8 @@
 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)

libs/hwui/hwui_static_deps.mk

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