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

Commit 6ac04600 authored by Colin Cross's avatar Colin Cross
Browse files

Make javanano a plugin 

Treat proto.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: Id7ed92d45583a7930f35c6734605d9304704bdbc
Merged-In: Id7ed92d45583a7930f35c6734605d9304704bdbc
parent 2895bf71

java/proto.go

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ func protoFlags(ctx android.ModuleContext, j *CompilerProperties, p *android.Pro 
			typeToPlugin = "javamicro"

		case "nano":

			flags.proto.OutTypeFlag = "--javanano_out"

			typeToPlugin = "javanano"

		case "lite":

			flags.proto.OutTypeFlag = "--java_out"

			flags.proto.OutParams = append(flags.proto.OutParams, "lite")