Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ed5e542 authored by Joe Onorato's avatar Joe Onorato Committed by Android (Google) Code Review
Browse files

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

parents 76b3f7a7 c05a8eec

core/clear_vars.mk

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ LOCAL_RENDERSCRIPT_TARGET_API:= 
LOCAL_DEX_PREOPT:= # '',true,false,nostripping

LOCAL_DEX_PREOPT_IMAGE_LOCATION:=

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_PROTO_JAVA_OUTPUT_PARAMS:=

LOCAL_VTSC_FLAGS:=

core/definitions.mk

+7 −1
Original line number Diff line number Diff line
@@ -1150,6 +1150,7 @@ endef 
###########################################################

## Commands for running protoc to compile .proto into .java

###########################################################

# PATH contains HOST_OUT_EXECUTABLES to allow protoc-gen-* plugins



define transform-proto-to-java

@mkdir -p $(dir $@)
@@ -1157,6 +1158,7 @@ define transform-proto-to-java 
@rm -rf $(PRIVATE_PROTO_JAVA_OUTPUT_DIR)

@mkdir -p $(PRIVATE_PROTO_JAVA_OUTPUT_DIR)

$(hide) for f in $(PRIVATE_PROTO_SRC_FILES); do \

        PATH=$$PATH:$(HOST_OUT_EXECUTABLES) \

        $(PROTOC) \

        $(addprefix --proto_path=, $(PRIVATE_PROTO_INCLUDES)) \

        $(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

######################################################################

# PATH contains HOST_OUT_EXECUTABLES to allow protoc-gen-* plugins



define transform-proto-to-cc

@echo "Protoc: $@ <= $<"

@mkdir -p $(dir $@)

$(hide) $(PROTOC) \

$(hide) \

	PATH=$$PATH:$(HOST_OUT_EXECUTABLES) \

	$(PROTOC) \

	$(addprefix --proto_path=, $(PRIVATE_PROTO_INCLUDES)) \

	$(PRIVATE_PROTOC_FLAGS) \

	$<

core/java.mk

+5 −1
Original line number Diff line number Diff line
@@ -66,11 +66,15 @@ ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro) 
else

  ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano)

    LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-nano

  else

    ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),stream)

      # No library for stream protobufs

    else

      LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-lite

    endif

  endif

endif

endif



# LOCAL_STATIC_JAVA_AAR_LIBRARIES and LOCAL_STATIC_ANDROID_LIBRARIES are also LOCAL_STATIC_JAVA_LIBRARIES.

LOCAL_STATIC_JAVA_LIBRARIES := $(strip $(LOCAL_STATIC_JAVA_LIBRARIES) \

core/java_common.mk

+5 −0
Original line number Diff line number Diff line
@@ -54,9 +54,14 @@ else 
  ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano)

$(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javanano_out

  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

    endif

  endif

endif

$(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) : $(proto_sources_fullpath) $(PROTOC)