diff options
| author | Ying Wang <wangying@android.com> | 2013-07-25 15:36:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-25 15:36:07 -0700 |
| commit | 51aab8775ab86990abef411d00f5686e41022eee (patch) | |
| tree | f67ce38bab8ca16416390e5ad472baebba0edf38 /core | |
| parent | fcbc0b7f0b8f654414c97699b36e6356cbb4bb08 (diff) | |
| parent | 5d1db8b4335d554bfd7e028496f0305b78b0676b (diff) | |
| download | build-51aab8775ab86990abef411d00f5686e41022eee.zip build-51aab8775ab86990abef411d00f5686e41022eee.tar.gz build-51aab8775ab86990abef411d00f5686e41022eee.tar.bz2 | |
am 5d1db8b4: Merge "Allow proto builds to pass in java proto params."
* commit '5d1db8b4335d554bfd7e028496f0305b78b0676b':
Allow proto builds to pass in java proto params.
Diffstat (limited to 'core')
| -rw-r--r-- | core/base_rules.mk | 1 | ||||
| -rw-r--r-- | core/clear_vars.mk | 1 | ||||
| -rw-r--r-- | core/definitions.mk | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index f0a6398..f6497da 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -264,6 +264,7 @@ $(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): PRIVATE_PROTO_JAVA_OUTPUT_PARAMS := $(LOCAL_PROTO_JAVA_OUTPUT_PARAMS) $(proto_java_sources_file_stamp) : $(proto_sources_fullpath) $(PROTOC) $(call transform-proto-to-java) diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 8d84814..7ad58b2 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -120,6 +120,7 @@ LOCAL_BUILD_HOST_DEX:= LOCAL_DEX_PREOPT:= # '',true,false,nostripping LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,nano,full LOCAL_PROTOC_FLAGS:= +LOCAL_PROTO_JAVA_OUTPUT_PARAMS:= LOCAL_NO_CRT:= LOCAL_PROPRIETARY_MODULE:= LOCAL_MODULE_OWNER:= diff --git a/core/definitions.mk b/core/definitions.mk index 7834baa..012dc44 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -892,7 +892,7 @@ define transform-proto-to-java $(hide) for f in $(PRIVATE_PROTO_SRC_FILES); do \ $(PROTOC) \ $(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_PARAMS):$(PRIVATE_PROTO_JAVA_OUTPUT_DIR)" \ $(PRIVATE_PROTOC_FLAGS) \ $$f || exit 33; \ done |