Commit 33c0d952 authored by Ying Wang's avatar Ying Wang
Browse files

Allow module-specific protoc flags.

You can add local protoc flags via LOCAL_PROTOC_FLAGS.

Change-Id: If246a4edafe1edcec6a7f193bde8ce3c83de745b
parent 60293914
...@@ -290,6 +290,7 @@ $(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javamicr ...@@ -290,6 +290,7 @@ $(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javamicr
else 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
$(proto_java_sources_file_stamp): PRIVATE_PROTOC_FLAGS := $(LOCAL_PROTOC_FLAGS)
$(proto_java_sources_file_stamp) : $(proto_sources_fullpath) $(PROTOC) $(proto_java_sources_file_stamp) : $(proto_sources_fullpath) $(PROTOC)
$(call transform-proto-to-java) $(call transform-proto-to-java)
......
...@@ -160,6 +160,7 @@ proto_generated_objects := $(patsubst %.cc,%.o, $(proto_generated_cc_sources)) ...@@ -160,6 +160,7 @@ proto_generated_objects := $(patsubst %.cc,%.o, $(proto_generated_cc_sources))
$(proto_generated_cc_sources): PRIVATE_PROTO_INCLUDES := $(TOP) $(proto_generated_cc_sources): PRIVATE_PROTO_INCLUDES := $(TOP)
$(proto_generated_cc_sources): PRIVATE_PROTO_CC_OUTPUT_DIR := $(proto_generated_cc_sources_dir) $(proto_generated_cc_sources): PRIVATE_PROTO_CC_OUTPUT_DIR := $(proto_generated_cc_sources_dir)
$(proto_generated_cc_sources): PRIVATE_PROTOC_FLAGS := $(LOCAL_PROTOC_FLAGS)
$(proto_generated_cc_sources): $(proto_generated_cc_sources_dir)/%.pb.cc: %.proto $(PROTOC) $(proto_generated_cc_sources): $(proto_generated_cc_sources_dir)/%.pb.cc: %.proto $(PROTOC)
$(transform-proto-to-cc) $(transform-proto-to-cc)
......
...@@ -103,6 +103,7 @@ LOCAL_RENDERSCRIPT_INCLUDES:= ...@@ -103,6 +103,7 @@ LOCAL_RENDERSCRIPT_INCLUDES:=
LOCAL_BUILD_HOST_DEX:= LOCAL_BUILD_HOST_DEX:=
LOCAL_DEX_PREOPT:= LOCAL_DEX_PREOPT:=
LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,full LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,full
LOCAL_PROTOC_FLAGS:=
# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to # Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to
# iterate over thousands of entries every time. # iterate over thousands of entries every time.
......
...@@ -829,6 +829,7 @@ define transform-proto-to-java ...@@ -829,6 +829,7 @@ define transform-proto-to-java
$(hide) $(PROTOC) \ $(hide) $(PROTOC) \
$(addprefix --proto_path=, $(PRIVATE_PROTO_INCLUDES)) \ $(addprefix --proto_path=, $(PRIVATE_PROTO_INCLUDES)) \
$(PRIVATE_PROTO_JAVA_OUTPUT_OPTION)=$(PRIVATE_PROTO_JAVA_OUTPUT_DIR) \ $(PRIVATE_PROTO_JAVA_OUTPUT_OPTION)=$(PRIVATE_PROTO_JAVA_OUTPUT_DIR) \
$(PRIVATE_PROTOC_FLAGS) \
$(PRIVATE_PROTO_SRC_FILES) $(PRIVATE_PROTO_SRC_FILES)
$(hide) touch $@ $(hide) touch $@
endef endef
...@@ -841,6 +842,7 @@ define transform-proto-to-cc ...@@ -841,6 +842,7 @@ define transform-proto-to-cc
@echo "Protoc: $@ <= $<" @echo "Protoc: $@ <= $<"
$(hide) $(PROTOC) \ $(hide) $(PROTOC) \
$(addprefix --proto_path=, $(PRIVATE_PROTO_INCLUDES)) \ $(addprefix --proto_path=, $(PRIVATE_PROTO_INCLUDES)) \
$(PRIVATE_PROTOC_FLAGS) \
--cpp_out=$(PRIVATE_PROTO_CC_OUTPUT_DIR) $< --cpp_out=$(PRIVATE_PROTO_CC_OUTPUT_DIR) $<
endef endef
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment