| commit | e6fae504553e32ea9da701520ff1adc529898f98 | [log] [tgz] |
|---|---|---|
| author | Yabin Cui <yabinc@google.com> | Tue Jun 14 00:16:34 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jun 14 00:16:34 2016 +0000 |
| tree | 6b8782c1e3e8df388addd4efd4c14144226ae8ce | |
| parent | dca955a9bdf06622d9920095ac7e3ab7a2e003cb [diff] | |
| parent | 72a1156efb1b849c6402b41b021d75b6d57d203e [diff] |
Merge "Add option to link static lite protobuf library."
diff --git a/core/binary.mk b/core/binary.mk index c3bf451..0c57030 100644 --- a/core/binary.mk +++ b/core/binary.mk
@@ -720,6 +720,8 @@ 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