commit c05a8eec4bf110cdd2911a4d92e392d000613d6b
author Joe Onorato <joeo@google.com> Wed Oct 05 18:01:10 2016 -0700
committer Joe Onorato <joeo@google.com> Thu Oct 13 16:34:07 2016 -0700
tree 8686058c9a2d765b75691b44bed4c503c07d28d8
parent 7261bca1cf4b5c9627f50daf2b96d39461104970

Add streaming proto option to the build system.

Test: make w/ other prereq changes
Change-Id: Ie8711878e244074a9a3c128467eeb4908c2ef008

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 4370d8c..198c075 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -67,7 +67,11 @@
   ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano)
     LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-nano
   else
-    LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-lite
+    ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),stream)
+      # No library for stream protobufs
+    else
+      LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-lite
+    endif
   endif
 endif
 endif