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

Merge "Add the system image test to the bazel sandwich" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-08-24 21:50:22 +00:00
committed by Gerrit Code Review
parent 234bb3bd8d 39b614af17
commit 4e6c42d417
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/allowlists/allowlists.go
View File

@@ -1649,5 +1649,9 @@ var (
Label: "//build/bazel/examples/partitions:system_image", Label: "//build/bazel/examples/partitions:system_image",
Host: false, Host: false,
}, },
{
Label: "//build/bazel/examples/partitions:run_test",
Host: false,
},
} }
) )

9
android/bazel_handler.go
View File

@@ -1382,7 +1382,14 @@ func (c *bazelSingleton) GenerateBuildActions(ctx SingletonContext) {
WriteFileRuleVerbatim(ctx, out, "") WriteFileRuleVerbatim(ctx, out, "")
case "FileWrite", "SourceSymlinkManifest": case "FileWrite", "SourceSymlinkManifest":
out := PathForBazelOut(ctx, buildStatement.OutputPaths[0]) out := PathForBazelOut(ctx, buildStatement.OutputPaths[0])
WriteFileRuleVerbatim(ctx, out, buildStatement.FileContents) // TODO(b/297366783) This is a hack to make files from skylib's diff_test executable.
// We need to update bazel to have aquery tell us whether a file is supposed to be
// executable or not.
if strings.HasSuffix(buildStatement.OutputPaths[0], "-test.sh") {
WriteExecutableFileRuleVerbatim(ctx, out, buildStatement.FileContents)
} else {
WriteFileRuleVerbatim(ctx, out, buildStatement.FileContents)
}
case "SymlinkTree": case "SymlinkTree":
// build-runfiles arguments are the manifest file and the target directory // build-runfiles arguments are the manifest file and the target directory
// where it creates the symlink tree according to this manifest (and then // where it creates the symlink tree according to this manifest (and then

12
android/defs.go
View File

@@ -209,12 +209,14 @@ func WriteFileRuleVerbatim(ctx BuilderContext, outputFile WritablePath, content
buildWriteFileRule(ctx, outputFile, content) buildWriteFileRule(ctx, outputFile, content)
} }
func CatFileRule(ctx BuilderContext, paths Paths, outputFile WritablePath) { // WriteExecutableFileRuleVerbatim is the same as WriteFileRuleVerbatim, but runs chmod +x on the result
func WriteExecutableFileRuleVerbatim(ctx BuilderContext, outputFile WritablePath, content string) {
intermediate := PathForIntermediates(ctx, "write_executable_file_intermediates").Join(ctx, outputFile.String())
WriteFileRuleVerbatim(ctx, intermediate, content)
ctx.Build(pctx, BuildParams{ ctx.Build(pctx, BuildParams{
Rule: Cat, Rule: CpExecutable,
Inputs: paths, Output: outputFile,
Output: outputFile, Input: intermediate,
Description: "combine files to " + outputFile.Base(),
}) })
} }