Merge \\"Add option to link static lite protobuf library.\\" am: e6fae50455

am: bebdc16a68

Change-Id: I60b9fb9437fe15079c62c3d47401341b54ebc7bc
This commit is contained in:
Yabin Cui 2016-06-14 01:24:05 +00:00 committed by android-build-merger
commit 494c2b5ebc
1 changed files with 2 additions and 0 deletions

View File

@ -722,6 +722,8 @@ else ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),full)
else
my_shared_libraries += libprotobuf-cpp-full
endif
else ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),lite-static)
my_static_libraries += libprotobuf-cpp-lite
else
ifdef LOCAL_SDK_VERSION
my_static_libraries += libprotobuf-cpp-lite-ndk