openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Add streaming proto option to the build system."

This commit is contained in:
Joe Onorato 2016-10-14 17:41:07 +00:00 committed by Android (Google) Code Review
parent 76b3f7a725 c05a8eec4b
commit 3ed5e54265
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/clear_vars.mk
View File

@ -145,7 +145,7 @@ LOCAL_RENDERSCRIPT_TARGET_API:=
LOCAL_DEX_PREOPT:= # '',true,false,nostripping LOCAL_DEX_PREOPT:= # '',true,false,nostripping
LOCAL_DEX_PREOPT_IMAGE_LOCATION:= LOCAL_DEX_PREOPT_IMAGE_LOCATION:=
LOCAL_DEX_PREOPT_FLAGS:= LOCAL_DEX_PREOPT_FLAGS:=
LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,nano,full,nanopb-c,nanopb-c-enable_malloc LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,nano,stream,full,nanopb-c,nanopb-c-enable_malloc
LOCAL_PROTOC_FLAGS:= LOCAL_PROTOC_FLAGS:=
LOCAL_PROTO_JAVA_OUTPUT_PARAMS:= LOCAL_PROTO_JAVA_OUTPUT_PARAMS:=
LOCAL_VTSC_FLAGS:= LOCAL_VTSC_FLAGS:=

8
core/definitions.mk
View File

@ -1150,6 +1150,7 @@ endef
########################################################### ###########################################################
## Commands for running protoc to compile .proto into .java ## Commands for running protoc to compile .proto into .java
########################################################### ###########################################################
# PATH contains HOST_OUT_EXECUTABLES to allow protoc-gen-* plugins
define transform-proto-to-java define transform-proto-to-java
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@ -1157,6 +1158,7 @@ define transform-proto-to-java
@rm -rf $(PRIVATE_PROTO_JAVA_OUTPUT_DIR) @rm -rf $(PRIVATE_PROTO_JAVA_OUTPUT_DIR)
@mkdir -p $(PRIVATE_PROTO_JAVA_OUTPUT_DIR) @mkdir -p $(PRIVATE_PROTO_JAVA_OUTPUT_DIR)
$(hide) for f in $(PRIVATE_PROTO_SRC_FILES); do \ $(hide) for f in $(PRIVATE_PROTO_SRC_FILES); do \
PATH=$$PATH:$(HOST_OUT_EXECUTABLES) \
$(PROTOC) \ $(PROTOC) \
$(addprefix --proto_path=, $(PRIVATE_PROTO_INCLUDES)) \ $(addprefix --proto_path=, $(PRIVATE_PROTO_INCLUDES)) \
$(PRIVATE_PROTO_JAVA_OUTPUT_OPTION)="$(PRIVATE_PROTO_JAVA_OUTPUT_PARAMS):$(PRIVATE_PROTO_JAVA_OUTPUT_DIR)" \ $(PRIVATE_PROTO_JAVA_OUTPUT_OPTION)="$(PRIVATE_PROTO_JAVA_OUTPUT_PARAMS):$(PRIVATE_PROTO_JAVA_OUTPUT_DIR)" \
@ -1169,10 +1171,14 @@ endef
###################################################################### ######################################################################
## Commands for running protoc to compile .proto into .pb.cc (or.pb.c) and .pb.h ## Commands for running protoc to compile .proto into .pb.cc (or.pb.c) and .pb.h
###################################################################### ######################################################################
# PATH contains HOST_OUT_EXECUTABLES to allow protoc-gen-* plugins
define transform-proto-to-cc define transform-proto-to-cc
@echo "Protoc: $@ <= $<" @echo "Protoc: $@ <= $<"
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) $(PROTOC) \ $(hide) \
PATH=$$PATH:$(HOST_OUT_EXECUTABLES) \
$(PROTOC) \
$(addprefix --proto_path=, $(PRIVATE_PROTO_INCLUDES)) \ $(addprefix --proto_path=, $(PRIVATE_PROTO_INCLUDES)) \
$(PRIVATE_PROTOC_FLAGS) \ $(PRIVATE_PROTOC_FLAGS) \
$< $<

4
core/java.mk
View File

@ -66,9 +66,13 @@ ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro)
else else
ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano) ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano)
LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-nano LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-nano
else
ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),stream)
# No library for stream protobufs
else else
LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-lite LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-lite
endif endif
endif
endif endif
endif endif

5
core/java_common.mk
View File

@ -54,8 +54,13 @@ else
ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano) ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano)
$(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javanano_out $(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javanano_out
else else
ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),stream)
$(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javastream_out
$(proto_java_sources_file_stamp): $(HOST_OUT_EXECUTABLES)/protoc-gen-javastream
else
$(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --java_out $(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --java_out
endif endif
endif
endif endif
$(proto_java_sources_file_stamp): PRIVATE_PROTOC_FLAGS := $(LOCAL_PROTOC_FLAGS) $(proto_java_sources_file_stamp): PRIVATE_PROTOC_FLAGS := $(LOCAL_PROTOC_FLAGS)
$(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_PARAMS := $(LOCAL_PROTO_JAVA_OUTPUT_PARAMS) $(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_PARAMS := $(LOCAL_PROTO_JAVA_OUTPUT_PARAMS)