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

Make tests work again on Darwin.

Browse Source 
aosp/1609473 broke this by making originalEnv empty unless
InitEnvironment() is called, which doesn't happen in tests.

Bug: 181835672
Test: "m nothing" on Linux and Darwin.
Change-Id: I33f9cce65a9151e620e1dddafb62d4c599ed2cac
This commit is contained in:
Lukacs T. Berki
2021-03-04 10:50:10 +01:00
parent ddebd2c82a
commit deba72161c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/config.go
View File

@@ -232,7 +232,7 @@ func TestConfig(buildDir string, env map[string]string, bp string, fs map[string
// Copy the real PATH value to the test environment, it's needed by // Copy the real PATH value to the test environment, it's needed by
// NonHermeticHostSystemTool() used in x86_darwin_host.go // NonHermeticHostSystemTool() used in x86_darwin_host.go
envCopy["PATH"] = originalEnv["PATH"] envCopy["PATH"] = os.Getenv("PATH")
config := &config{ config := &config{
productVariables: productVariables{ productVariables: productVariables{