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

Merge changes I13910647,Ie061e90c,I1c1cb098

Browse Source 
* changes:
  Escape genrule commands
  Allow java binary wrapper files to reference filegroups
  Allow globs in tool_files
This commit is contained in:
Treehugger Robot
2017-12-11 23:55:57 +00:00
committed by Gerrit Code Review
parent 75f2e70dff 31603067b0
commit d4c03092cd
2 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
genrule/genrule.go
View File

@@ -131,6 +131,7 @@ func (g *Module) GeneratedHeaderDirs() android.Paths {
func (g *Module) DepsMutator(ctx android.BottomUpMutatorContext) {
android.ExtractSourcesDeps(ctx, g.properties.Srcs)
android.ExtractSourcesDeps(ctx, g.properties.Tool_files)
if g, ok := ctx.Module().(*Module); ok {
if len(g.properties.Tools) > 0 {
ctx.AddFarVariationDependencies([]blueprint.Variation{
@@ -141,11 +142,6 @@ func (g *Module) DepsMutator(ctx android.BottomUpMutatorContext) {
}
func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) {
if len(g.properties.Tools) == 0 && len(g.properties.Tool_files) == 0 {
ctx.ModuleErrorf("at least one `tools` or `tool_files` is required")
return
}
if len(g.properties.Export_include_dirs) > 0 {
for _, dir := range g.properties.Export_include_dirs {
g.exportedIncludeDirs = append(g.exportedIncludeDirs,
@@ -208,13 +204,13 @@ func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) {
return
}
for _, tool := range g.properties.Tool_files {
toolPath := android.PathForModuleSrc(ctx, tool)
g.deps = append(g.deps, toolPath)
if _, exists := tools[tool]; !exists {
tools[tool] = toolPath
toolFiles := ctx.ExpandSources(g.properties.Tool_files, nil)
for _, tool := range toolFiles {
g.deps = append(g.deps, tool)
if _, exists := tools[tool.Rel()]; !exists {
tools[tool.Rel()] = tool
} else {
ctx.ModuleErrorf("multiple tools for %q, %q and %q", tool, tools[tool], toolPath.String())
ctx.ModuleErrorf("multiple tools for %q, %q and %q", tool, tools[tool.Rel()], tool.Rel())
}
}
@@ -226,10 +222,14 @@ func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) {
rawCommand, err := android.Expand(task.cmd, func(name string) (string, error) {
switch name {
case "location":
if len(g.properties.Tools) == 0 && len(toolFiles) == 0 {
return "", fmt.Errorf("at least one `tools` or `tool_files` is required if $(location) is used")
}
if len(g.properties.Tools) > 0 {
return tools[g.properties.Tools[0]].String(), nil
} else {
return tools[g.properties.Tool_files[0]].String(), nil
return tools[toolFiles[0].Rel()].String(), nil
}
case "in":
return "${in}", nil
@@ -277,7 +277,10 @@ func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
genDir := android.PathForModuleGen(ctx)
sandboxCommand := fmt.Sprintf("$sboxCmd --sandbox-path %s --output-root %s -c %q %s $allouts", sandboxPath, genDir, rawCommand, depfilePlaceholder)
// Escape the command for the shell
rawCommand = "'" + strings.Replace(rawCommand, "'", `'\''`, -1) + "'"
sandboxCommand := fmt.Sprintf("$sboxCmd --sandbox-path %s --output-root %s -c %s %s $allouts",
sandboxPath, genDir, rawCommand, depfilePlaceholder)
ruleParams := blueprint.RuleParams{
Command: sandboxCommand,

12
java/java.go
View File

@@ -1031,7 +1031,7 @@ type Binary struct {
isWrapperVariant bool
wrapperFile android.SourcePath
wrapperFile android.Path
binaryFile android.OutputPath
}
@@ -1048,7 +1048,13 @@ func (j *Binary) GenerateAndroidBuildActions(ctx android.ModuleContext) {
j.isWrapperVariant = true
if String(j.binaryProperties.Wrapper) != "" {
j.wrapperFile = android.PathForModuleSrc(ctx, String(j.binaryProperties.Wrapper)).SourcePath
wrapperSrcs := ctx.ExpandSources([]string{String(j.binaryProperties.Wrapper)}, nil)
if len(wrapperSrcs) == 1 {
j.wrapperFile = wrapperSrcs[0]
} else {
ctx.PropertyErrorf("wrapper", "module providing wrapper must produce exactly one file")
return
}
} else {
j.wrapperFile = android.PathForSource(ctx, "build/soong/scripts/jar-wrapper.sh")
}
@@ -1065,6 +1071,8 @@ func (j *Binary) GenerateAndroidBuildActions(ctx android.ModuleContext) {
func (j *Binary) DepsMutator(ctx android.BottomUpMutatorContext) {
if ctx.Arch().ArchType == android.Common {
j.deps(ctx)
} else {
android.ExtractSourcesDeps(ctx, []string{String(j.binaryProperties.Wrapper)})
}
}