Commit 7edd91c0 authored Sep 07, 2021 by Lukacs T. Berki

Make incremental queryview builds work.

The breakage was because:
- aosp/1818236 removed the "rm -fr" invocation from the Ninja file that
removed the old queryview tree
- queryview files were created with permissions 440 to discourage manual
editing

These two together made incremental queryview invocations not be able to
overwrite its output files.

(Of course, it also made them incorrect since old files were lft in place)

Test: Presubmits.
Change-Id: Idaa3e1db82c9eb8325c48e37aca5146e69af7333

parent 3a82169a

cmd/soong_build/queryview.go

+4 −2

Original line number	Diff line number	Diff line
		@@ -15,14 +15,16 @@
		package main

		import (
		"android/soong/android"
		"android/soong/bp2build"
		"io/ioutil"
		"os"
		"path/filepath"

		"android/soong/android"
		"android/soong/bp2build"
		)

		func createBazelQueryView(ctx *bp2build.CodegenContext, bazelQueryViewDir string) error {
		os.RemoveAll(bazelQueryViewDir)
		ruleShims := bp2build.CreateRuleShims(android.ModuleTypeFactories())

		// Ignore metrics reporting and compat layers for queryview, since queryview