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

am: e6fae50455 Change-Id: Idcc3c54033724a9cef17a219b4c118689eaad297
2016-06-14 00:25:05 +00:00 · 2016-06-14 00:25:05 +00:00 · bebdc16a68
parent 58c8559979 e6fae50455
commit bebdc16a68
1 changed files with 2 additions and 0 deletions
--- a/core/binary.mk
+++ b/core/binary.mk
@ -720,6 +720,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