diff options
| author | 2019-08-13 16:57:56 -0700 | |
|---|---|---|
| committer | 2019-09-05 14:42:14 -0700 | |
| commit | 521d4454fa49b51abc4e7102c06f5bca8a6edf13 (patch) | |
| tree | 08ecde00e8b79b7d659946754d4aa5dc05ffda5b | |
| parent | fdef43d69ca2fb75ab9d171474f3102f8280564d (diff) | |
Make javanano a plugin
Treat LOCAL_PROTOC_OPTIMIZE_TYPE := javanano as a plugin by
explicitly passing the path to protoc-gen-javanano. This allows
removing the javanano customizations from the core plugin code,
which no longer supports javanano natively.
Bug: 117607748
Test: m checkbuild
Change-Id: I913d798136fbee9bfaabe1d815b80c85025cb9b9
Merged-In: I913d798136fbee9bfaabe1d815b80c85025cb9b9
| -rw-r--r-- | core/java_common.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java_common.mk b/core/java_common.mk index a23d92d9f6..dfe75f3257 100644 --- a/core/java_common.mk +++ b/core/java_common.mk @@ -86,6 +86,8 @@ ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro) $(proto_java_srcjar): $(HOST_OUT_EXECUTABLES)/protoc-gen-javamicro else ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano) $(proto_java_srcjar): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javanano_out + $(proto_java_srcjar): PRIVATE_PROTOC_FLAGS += --plugin=$(HOST_OUT_EXECUTABLES)/protoc-gen-javanano + $(proto_java_srcjar): $(HOST_OUT_EXECUTABLES)/protoc-gen-javanano else ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),stream) $(proto_java_srcjar): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javastream_out $(proto_java_srcjar): PRIVATE_PROTOC_FLAGS += --plugin=$(HOST_OUT_EXECUTABLES)/protoc-gen-javastream |