aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2015-03-27 10:46:01 -0700
committerColin Cross <ccross@android.com>2015-03-27 17:56:34 -0700
commitdf6f7ae064b7370ac4c791e5613d7133d5ff4145 (patch)
tree948347c049578e453aa706bb5112b4afbf1007c3
parent5890b58b2146eb59db0ebf37bf675f90e8ebfb0c (diff)
downloadbuild_soong-df6f7ae064b7370ac4c791e5613d7133d5ff4145.tar.gz
build_soong-df6f7ae064b7370ac4c791e5613d7133d5ff4145.tar.bz2
build_soong-df6f7ae064b7370ac4c791e5613d7133d5ff4145.zip
androidmk: add BUILD_OS conditionals
Some Android.mk files use BUILD_OS instead of HOST_OS for selecting options when building host tools. Change-Id: Ic4869cdee01da050364bb21b47f3de8fd8adaa96
-rw-r--r--androidmk/cmd/androidmk/android.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go
index 71c58321..44165e83 100644
--- a/androidmk/cmd/androidmk/android.go
+++ b/androidmk/cmd/androidmk/android.go
@@ -93,6 +93,10 @@ var conditionalTranslations = map[string]struct {
"($(HOST_OS), windows)": {"target", "windows"},
"($(HOST_OS),linux)": {"target", "linux"},
"($(HOST_OS), linux)": {"target", "linux"},
+ "($(BUILD_OS),darwin)": {"target", "darwin"},
+ "($(BUILD_OS), darwin)": {"target", "darwin"},
+ "($(BUILD_OS),linux)": {"target", "linux"},
+ "($(BUILD_OS), linux)": {"target", "linux"},
}
func mydir(args []string) string {