From 521d4454fa49b51abc4e7102c06f5bca8a6edf13 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 13 Aug 2019 16:57:56 -0700 Subject: [PATCH] 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 --- core/java_common.mk | 2 ++ 1 file changed, 2 insertions(+) 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