Make tests work again on Darwin.

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

parent ddebd2c8

android/config.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -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
		// NonHermeticHostSystemTool() used in x86_darwin_host.go
		envCopy["PATH"] = originalEnv["PATH"]
		envCopy["PATH"] = os.Getenv("PATH")

		config := &config{
		productVariables: productVariables{