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

Commit 245b1bf4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Quote aquery commands."

parents a7f0c392 c3192996

android/bazel.go

+3 −0
Original line number Diff line number Diff line
@@ -334,6 +334,9 @@ var ( 
	mixedBuildsDisabledList = []string{

		"libbrotli",               // http://b/198585397, ld.lld: error: bionic/libc/arch-arm64/generic/bionic/memmove.S:95:(.text+0x10): relocation R_AARCH64_CONDBR19 out of range: -1404176 is not in [-1048576, 1048575]; references __memcpy

		"minijail_constants_json", // http://b/200899432, bazel-built cc_genrule does not work in mixed build when it is a dependency of another soong module.



		"cap_names.h", // TODO(b/204913827) runfiles need to be handled in mixed builds

		"libcap",      // TODO(b/204913827) runfiles need to be handled in mixed builds

	}



	// Used for quicker lookups

bazel/aquery.go

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ func AqueryBuildStatements(aqueryJsonProto []byte) ([]BuildStatement, error) { 
		}



		buildStatement := BuildStatement{

			Command:     strings.Join(proptools.ShellEscapeList(actionEntry.Arguments), " "),

			Command:     strings.Join(proptools.ShellEscapeListIncludingSpaces(actionEntry.Arguments), " "),

			Depfile:     depfile,

			OutputPaths: outputPaths,

			InputPaths:  inputPaths,

bazel/aquery_test.go

+3 −3
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ func TestTransitiveInputDepsets(t *testing.T) { 
	}

	expectedBuildStatements := []BuildStatement{

		BuildStatement{

			Command:     "/bin/bash -c touch bazel-out/sourceroot/k8-fastbuild/bin/testpkg/test_out",

			Command:     "/bin/bash -c 'touch bazel-out/sourceroot/k8-fastbuild/bin/testpkg/test_out'",

			OutputPaths: []string{"bazel-out/sourceroot/k8-fastbuild/bin/testpkg/test_out"},

			InputPaths:  inputPaths,

			Mnemonic:    "Action",
@@ -1378,7 +1378,7 @@ func assertError(t *testing.T, err error, expected string) { 
func assertBuildStatements(t *testing.T, expected []BuildStatement, actual []BuildStatement) {

	t.Helper()

	if len(expected) != len(actual) {

		t.Errorf("expected %d build statements, but got %d,\n expected: %v,\n actual: %v",

		t.Errorf("expected %d build statements, but got %d,\n expected: %#v,\n actual: %#v",

			len(expected), len(actual), expected, actual)

		return

	}
@@ -1389,7 +1389,7 @@ ACTUAL_LOOP: 
				continue ACTUAL_LOOP

			}

		}

		t.Errorf("unexpected build statement %v.\n expected: %v",

		t.Errorf("unexpected build statement %#v.\n expected: %#v",

			actualStatement, expected)

		return

	}