Merge "Use platform protobuf unless building with NDK." (1f637158) · Commits · e / os / android_build

core/binary.mk

+12 −2

Original line number	Diff line number	Diff line
		@@ -561,13 +561,23 @@ ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),full)
		$(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

		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

		ifdef LOCAL_SDK_VERSION
		my_static_libraries += libprotobuf-cpp-lite
		else
		my_shared_libraries += libprotobuf-cpp-lite
		endif
		endif
		endif # $(proto_sources) non-empty