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

Enable Java in mixed builds.

Browse Source 
Allowlist manual BUILD files in prebuilts/bazel for
the toolchain setup.

Test: b build build/bazel/examples/java/...
Change-Id: Id649dce631731e5396da4a9fe224e33f8949dd7d
Bug: 196441639
This commit is contained in:
Romain Jobredeaux
2022-05-30 22:02:31 -04:00
committed by Sasha Smundak
parent b262f883a9
commit 2919797aaa
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/allowlists/allowlists.go
View File

@@ -257,6 +257,7 @@ var (
"packages/apps/QuickSearchBox":/* recursive = */ true,
"packages/apps/WallpaperPicker":/* recursive = */ false,
"prebuilts/bazel":/* recursive = */ true,
"prebuilts/bundletool":/* recursive = */ true,
"prebuilts/gcc":/* recursive = */ true,
"prebuilts/build-tools":/* recursive = */ true,

6
android/bazel_handler.go
View File

@@ -399,12 +399,6 @@ type builtinBazelRunner struct{}
func (r *builtinBazelRunner) issueBazelCommand(paths *bazelPaths, runName bazel.RunName, command bazelCommand,
extraFlags ...string) (string, string, error) {
cmdFlags := []string{
// --noautodetect_server_javabase has the practical consequence of preventing Bazel from
// attempting to download rules_java, which is incompatible with
// --experimental_repository_disable_download set further below.
// rules_java is also not needed until mixed builds start building java targets.
// TODO(b/197958133): Once rules_java is pulled into AOSP, remove this flag.
"--noautodetect_server_javabase",
"--output_base=" + absolutePath(paths.outputBase),
command.command,
}