diff options
| author | Colin Cross <ccross@android.com> | 2015-03-26 16:15:58 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-03-27 17:56:34 -0700 |
| commit | bbcb4963d6744d1293a3daf7da4714ed95a47d6e (patch) | |
| tree | 56b14e1f110efd2de297e8c3ff36f375a871c0a3 /androidmk | |
| parent | 24e6aef9413e435231b5635959f61cae3d529e7e (diff) | |
| download | build_soong-bbcb4963d6744d1293a3daf7da4714ed95a47d6e.tar.gz build_soong-bbcb4963d6744d1293a3daf7da4714ed95a47d6e.tar.bz2 build_soong-bbcb4963d6744d1293a3daf7da4714ed95a47d6e.zip | |
androidmk: support conditionals on HOST_OS == linux
Add HOST_OS == linux to the supported conditionals, and replace
a manual list with a map lookup.
Change-Id: I0c26e3a854d1011870f41c05fc400d68334cd45f
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/cmd/androidmk/android.go | 10 | ||||
| -rw-r--r-- | androidmk/cmd/androidmk/androidmk.go | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index 7fd9919d..71c58321 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -87,10 +87,12 @@ var conditionalTranslations = map[string]struct { class string suffix string }{ - "($(HOST_OS),darwin)": {"host_os", "darwin"}, - "($(HOST_OS), darwin)": {"host_os", "darwin"}, - "($(HOST_OS),windows)": {"host_os", "windows"}, - "($(HOST_OS), windows)": {"host_os", "windows"}, + "($(HOST_OS),darwin)": {"target", "darwin"}, + "($(HOST_OS), darwin)": {"target", "darwin"}, + "($(HOST_OS),windows)": {"target", "windows"}, + "($(HOST_OS), windows)": {"target", "windows"}, + "($(HOST_OS),linux)": {"target", "linux"}, + "($(HOST_OS), linux)": {"target", "linux"}, } func mydir(args []string) string { diff --git a/androidmk/cmd/androidmk/androidmk.go b/androidmk/cmd/androidmk/androidmk.go index 03888fe3..22b29b24 100644 --- a/androidmk/cmd/androidmk/androidmk.go +++ b/androidmk/cmd/androidmk/androidmk.go @@ -125,9 +125,7 @@ func main() { case "ifeq", "ifneq": args := directive.Args.Dump() eq := directive.Name == "ifeq" - switch args { - case "($(HOST_OS),windows)", "($(HOST_OS), windows)", - "($(HOST_OS),darwin)", "($(HOST_OS), darwin)": + if _, ok := conditionalTranslations[args]; ok { newCond := conditional{args, eq} conds = append(conds, &newCond) if cond == nil { @@ -135,7 +133,7 @@ func main() { } else { file.errorf(directive, "unsupported nested conditional") } - default: + } else { file.errorf(directive, "unsupported conditional") conds = append(conds, nil) continue |