tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Enable Java in mixed builds."

Browse source
This commit is contained in:
Romain Jobredeaux 2022-07-18 14:51:55 +00:00 committed by Gerrit Code Review
commit b3e7dfbd80
2 changed files with 1 additions and 6 deletions
Show stats 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/QuickSearchBox":/* recursive = */ true,
"packages/apps/WallpaperPicker":/* recursive = */ false, "packages/apps/WallpaperPicker":/* recursive = */ false,
"prebuilts/bazel":/* recursive = */ true,
"prebuilts/bundletool":/* recursive = */ true, "prebuilts/bundletool":/* recursive = */ true,
"prebuilts/gcc":/* recursive = */ true, "prebuilts/gcc":/* recursive = */ true,
"prebuilts/build-tools":/* 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, func (r *builtinBazelRunner) issueBazelCommand(paths *bazelPaths, runName bazel.RunName, command bazelCommand,
extraFlags ...string) (string, string, error) { extraFlags ...string) (string, string, error) {
cmdFlags := []string{ 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), "--output_base=" + absolutePath(paths.outputBase),
command.command, command.command,
} }