Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3e7dfbd authored by Romain Jobredeaux's avatar Romain Jobredeaux Committed by Gerrit Code Review
Browse files

Merge "Enable Java in mixed builds."

parents e3048505 2919797a

android/allowlists/allowlists.go

+1 −0
Original line number Diff line number Diff line
@@ -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,

android/bazel_handler.go

+0 −6
Original line number Diff line number Diff line
@@ -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,

	}