StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Print a correct error message when a non-hermetic tool is not found." am: a55aefd57b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625979

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I299a2ded24a68fb99a95da2341bd8a9ae7f587ea
This commit is contained in:
Lukács T. Berki
2021-03-11 07:51:56 +00:00
committed by Automerger Merge Worker
parent 6222fd77f5 a55aefd57b
commit d922efecce
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/config.go
View File

@@ -542,9 +542,8 @@ func (c *config) NonHermeticHostSystemTool(name string) string {
} }
} }
panic(fmt.Errorf( panic(fmt.Errorf(
"Unable to use '%s' as a host system tool for build system "+ "Cannot find non-hermetic system tool '%s' on path '%s'",
"hermeticity reasons. See build/soong/ui/build/paths/config.go "+ name, c.Getenv("PATH")))
"for the full list of allowed host tools on your system.", name))
} }
// PrebuiltOS returns the name of the host OS used in prebuilts directories. // PrebuiltOS returns the name of the host OS used in prebuilts directories.