commit 3fb1faeeb98143e132ca4d6f1cac42d6f060888b
author Dan Willemsen <dwillemsen@google.com> Mon Mar 12 15:30:26 2018 -0700
committer Dan Willemsen <dwillemsen@google.com> Wed Apr 11 01:45:14 2018 +0000
tree b4c20c42a739b22d472b8d23ebf8189597e77c93
parent 47f98af97fdf6d8d294d5f1173abcf189c21acd5

Use Config/DeviceConfig functions to access ProductVariables

An upcoming change will stop exporting ProductVariables from Config, so
switch to using existing accessor functions, and add more when they're
missing.

Bug: 76168832
Test: out/soong/build.ninja is identical
Change-Id: Ie0135bdbd2df3258ef3ddb53e5f8fc00aa9b97f7

cc/binary.go

diff --git a/cc/binary.go b/cc/binary.go
index c3e899a..9e7b70b 100644
--- a/cc/binary.go
+++ b/cc/binary.go
@@ -192,7 +192,7 @@
 
 	if !ctx.toolchain().Bionic() {
 		if ctx.Os() == android.Linux {
-			if binary.Properties.Static_executable == nil && Bool(ctx.Config().ProductVariables.HostStaticBinaries) {
+			if binary.Properties.Static_executable == nil && ctx.Config().HostStaticBinaries() {
 				binary.Properties.Static_executable = BoolPtr(true)
 			}
 		} else {