StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Use protoc-gen-javalite for java lite protos"

Browse Source 
This reverts commit 5a5aca0568.

Change-Id: Iadbc2ec7fbc45d888383e0e6f569cbfc5ef6a996
This commit is contained in:
Colin Cross
2018-11-04 17:23:45 -08:00
parent 87dc8b7138
commit 37a07b1784
3 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@@ -351,10 +351,6 @@ func (c *config) BlueprintToolLocation() string {
var _ bootstrap.ConfigBlueprintToolLocation = (*config)(nil) var _ bootstrap.ConfigBlueprintToolLocation = (*config)(nil)
func (c *config) HostToolPath(ctx PathContext, tool string) Path {
return PathForOutput(ctx, "host", c.PrebuiltOS(), "bin", tool)
}
// HostSystemTool looks for non-hermetic tools from the system we're running on. // HostSystemTool looks for non-hermetic tools from the system we're running on.
// Generally shouldn't be used, but useful to find the XCode SDK, etc. // Generally shouldn't be used, but useful to find the XCode SDK, etc.
func (c *config) HostSystemTool(name string) string { func (c *config) HostSystemTool(name string) string {

1
java/builder.go
View File

@@ -161,7 +161,6 @@ type javaBuilderFlags struct {
kotlincClasspath classpath kotlincClasspath classpath
protoFlags []string protoFlags []string
protoDeps android.Paths
protoOutTypeFlag string // The flag itself: --java_out protoOutTypeFlag string // The flag itself: --java_out
protoOutParams string // Parameters to that flag: --java_out=$protoOutParams:$outDir protoOutParams string // Parameters to that flag: --java_out=$protoOutParams:$outDir
protoRoot bool protoRoot bool

21
java/proto.go
View File

@@ -59,7 +59,6 @@ func genProto(ctx android.ModuleContext, protoFile android.Path, flags javaBuild
Description: "protoc " + protoFile.Rel(), Description: "protoc " + protoFile.Rel(),
Output: srcJarFile, Output: srcJarFile,
Input: protoFile, Input: protoFile,
Implicits: flags.protoDeps,
Args: map[string]string{ Args: map[string]string{
"protoBase": protoBase, "protoBase": protoBase,
"protoOut": flags.protoOutTypeFlag, "protoOut": flags.protoOutTypeFlag,
@@ -94,16 +93,14 @@ func protoDeps(ctx android.BottomUpMutatorContext, p *android.ProtoProperties) {
func protoFlags(ctx android.ModuleContext, j *CompilerProperties, p *android.ProtoProperties, func protoFlags(ctx android.ModuleContext, j *CompilerProperties, p *android.ProtoProperties,
flags javaBuilderFlags) javaBuilderFlags { flags javaBuilderFlags) javaBuilderFlags {
var plugin string
switch String(p.Proto.Type) { switch String(p.Proto.Type) {
case "micro": case "micro":
flags.protoOutTypeFlag = "--javamicro_out" flags.protoOutTypeFlag = "--javamicro_out"
case "nano": case "nano":
flags.protoOutTypeFlag = "--javanano_out" flags.protoOutTypeFlag = "--javanano_out"
case "lite": case "lite":
plugin = "protoc-gen-javalite" flags.protoOutTypeFlag = "--java_out"
flags.protoOutTypeFlag = "--javalite_out" flags.protoOutParams = "lite"
case "full", "": case "full", "":
flags.protoOutTypeFlag = "--java_out" flags.protoOutTypeFlag = "--java_out"
default: default:
@@ -111,15 +108,15 @@ func protoFlags(ctx android.ModuleContext, j *CompilerProperties, p *android.Pro
String(p.Proto.Type)) String(p.Proto.Type))
} }
flags.protoOutParams = strings.Join(j.Proto.Output_params, ",") if len(j.Proto.Output_params) > 0 {
if flags.protoOutParams != "" {
flags.protoOutParams += ","
}
flags.protoOutParams += strings.Join(j.Proto.Output_params, ",")
}
flags.protoFlags = android.ProtoFlags(ctx, p) flags.protoFlags = android.ProtoFlags(ctx, p)
flags.protoRoot = android.ProtoCanonicalPathFromRoot(ctx, p) flags.protoRoot = android.ProtoCanonicalPathFromRoot(ctx, p)
if plugin != "" {
path := ctx.Config().HostToolPath(ctx, plugin)
flags.protoDeps = append(flags.protoDeps, path)
flags.protoFlags = append(flags.protoFlags, "--plugin="+path.String())
}
return flags return flags
} }