diff options
| author | P.Y. Laligand <pylaligand@google.com> | 2015-03-11 10:14:41 -0700 |
|---|---|---|
| committer | P.Y. Laligand <pylaligand@google.com> | 2015-03-11 10:14:41 -0700 |
| commit | f7fb0e5e31120521380dfc8faeac5b59e05ff897 (patch) | |
| tree | b6c14961badb1bca0e95609f67a5ad1b2776e1be | |
| parent | 390f9fdc0723c01bc80d97e6f80d2e6db0d5e3ae (diff) | |
| download | build-f7fb0e5e31120521380dfc8faeac5b59e05ff897.zip build-f7fb0e5e31120521380dfc8faeac5b59e05ff897.tar.gz build-f7fb0e5e31120521380dfc8faeac5b59e05ff897.tar.bz2 | |
Add the correct dependency when the full version of the protocol buffer library is requested.
b/19415609
Change-Id: I8c5d25a5f8f60317fa0f31330dd354ee8fb61c12
| -rw-r--r-- | core/host_java_library_common.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/host_java_library_common.mk b/core/host_java_library_common.mk index d077634..35a6e28 100644 --- a/core/host_java_library_common.mk +++ b/core/host_java_library_common.mk @@ -50,7 +50,11 @@ else ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano) LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-nano else - LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-lite + ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),full) + LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-full + else + LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-lite + endif endif endif endif |