Add the correct dependency when the full version of the protocol buffer library is requested.

b/19415609 Change-Id: I8c5d25a5f8f60317fa0f31330dd354ee8fb61c12
2015-03-11 10:14:41 -07:00 · 2015-03-11 10:14:41 -07:00 · f7fb0e5e31
parent 390f9fdc07
commit f7fb0e5e31
1 changed files with 5 additions and 1 deletions
--- 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