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

Commit 0fe01f5b authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Always set ASAN_SYMBOLIZER_PATH appropriately" am: 713e1927 

am: 485d8af3

Change-Id: I22bdb785d66252ade4b0f22098f5e851c093b736
parents 8ef96325 485d8af3

ui/build/config.go

+5 −0
Original line number Diff line number Diff line
@@ -180,6 +180,11 @@ func NewConfig(ctx Context, args ...string) Config { 


	ret.environ.Set("TMPDIR", absPath(ctx, ret.TempDir()))



	// Always set ASAN_SYMBOLIZER_PATH so that ASAN-based tools can symbolize any crashes

	symbolizerPath := filepath.Join("prebuilts/clang/host", ret.HostPrebuiltTag(),

		"llvm-binutils-stable/llvm-symbolizer")

	ret.environ.Set("ASAN_SYMBOLIZER_PATH", absPath(ctx, symbolizerPath))



	// Precondition: the current directory is the top of the source tree

	checkTopDir(ctx)

ui/build/kati.go

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ func runKatiPackage(ctx Context, config Config) { 
			"TMPDIR",



			// Tool configs

			"ASAN_SYMBOLIZER_PATH",

			"JAVA_HOME",

			"PYTHONDONTWRITEBYTECODE",