Merge "Write cquery.out even without error" (d00b5629) · Commits · e / os / android_build_soong

android/bazel_handler.go

+2 −2

Original line number	Diff line number	Diff line
		@@ -767,9 +767,9 @@ func (context *bazelContext) InvokeBazel(config Config) error {
		cqueryOutput, cqueryErr, err := context.issueBazelCommand(context.paths, bazel.CqueryBuildRootRunName, cqueryCmd,
		"--output=starlark", "--starlark:file="+absolutePath(cqueryFileRelpath))
		if err != nil {
		_ = ioutil.WriteFile(filepath.Join(soongInjectionPath, "cquery.out"), []byte(cqueryOutput), 0666)
		return err
		}
		if err != nil {
		if err = ioutil.WriteFile(filepath.Join(soongInjectionPath, "cquery.out"), []byte(cqueryOutput), 0666); err != nil {
		return err
		}