commit 1f6371583ef6ce3a384262ebb291515f5ca3a7b6
author Dan Albert <danalbert@google.com> Tue Nov 11 19:28:34 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 11 19:28:34 2014 +0000
tree 2daab3da22f84c167b635acccf7e0bcf5200d21f
parent b38939436199c65299809f6adb50db6d3b44f7b0
parent c3031c70f70432f423c0e6a1f6f75d74798a0901

Merge "Use platform protobuf unless building with NDK."

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 122c4f5..455c64b 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -561,13 +561,23 @@
         $(warning Stripping unneeded dependency on libprotobuf-cpp-2.3.0-full in $(LOCAL_MODULE))
         my_static_libraries := $(filter-out libprotobuf-cpp-2.3.0-full,$(my_static_libraries))
     endif
-    my_static_libraries += libprotobuf-cpp-full
+
+    ifdef LOCAL_SDK_VERSION
+        my_static_libraries += libprotobuf-cpp-full
+    else
+        my_shared_libraries += libprotobuf-cpp-full
+    endif
 else
     ifneq ($(filter libprotobuf-cpp-2.3.0-lite,$(my_static_libraries)),)
         $(warning Stripping unneeded dependency on libprotobuf-cpp-2.3.0-lite in $(LOCAL_MODULE))
         my_static_libraries := $(filter-out libprotobuf-cpp-2.3.0-lite,$(my_static_libraries))
     endif
-    my_static_libraries += libprotobuf-cpp-lite
+
+    ifdef LOCAL_SDK_VERSION
+        my_static_libraries += libprotobuf-cpp-lite
+    else
+        my_shared_libraries += libprotobuf-cpp-lite
+    endif
 endif
 endif  # $(proto_sources) non-empty