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

androidmk: add support for ifdef USE_MINGW

Browse Source 
Change-Id: Ib3436cb4fd2469f5be2f7ee1525709eb1e143dbf
This commit is contained in:
Colin Cross
2015-04-16 13:33:59 -07:00
parent d0a3da2d88
commit d560a9e192
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
androidmk/cmd/androidmk/android.go
View File

@@ -102,6 +102,7 @@ var conditionalTranslations = map[string]struct {
"($(BUILD_OS), darwin)": {"target", "darwin"}, "($(BUILD_OS), darwin)": {"target", "darwin"},
"($(BUILD_OS),linux)": {"target", "linux"}, "($(BUILD_OS),linux)": {"target", "linux"},
"($(BUILD_OS), linux)": {"target", "linux"}, "($(BUILD_OS), linux)": {"target", "linux"},
"USE_MINGW": {"target", "windows"},
} }
func mydir(args []string) string { func mydir(args []string) string {

4
androidmk/cmd/androidmk/androidmk.go
View File

@@ -117,9 +117,9 @@ func main() {
file.errorf(directive, "unsupported include") file.errorf(directive, "unsupported include")
continue continue
} }
case "ifeq", "ifneq": case "ifeq", "ifneq", "ifdef", "ifndef":
args := directive.Args.Dump() args := directive.Args.Dump()
eq := directive.Name == "ifeq" eq := directive.Name == "ifeq" || directive.Name == "ifdef"
if _, ok := conditionalTranslations[args]; ok { if _, ok := conditionalTranslations[args]; ok {
newCond := conditional{args, eq} newCond := conditional{args, eq}
conds = append(conds, &newCond) conds = append(conds, &newCond)