aboutsummaryrefslogtreecommitdiffstats
path: root/androidmk
diff options
context:
space:
mode:
authorJaewoong Jung <jungjw@google.com>2019-03-05 14:25:25 -0800
committerJaewoong Jung <jungjw@google.com>2019-03-05 22:29:58 +0000
commitb8ba8a5ee84aa209192160de029f1c91f9dde636 (patch)
treee2b529e2ff2da7270a8a665dccbc20f7f5657fb9 /androidmk
parent5d3e2b70b868a5cd418a6d66b243b0d3aaabc62b (diff)
downloadbuild_soong-b8ba8a5ee84aa209192160de029f1c91f9dde636.tar.gz
build_soong-b8ba8a5ee84aa209192160de029f1c91f9dde636.tar.bz2
build_soong-b8ba8a5ee84aa209192160de029f1c91f9dde636.zip
Fixe typos in androidmk.
Replace contitional with conditional. Test: androidmk_test.go Change-Id: Ic261701f4588b9b8b6d3560598831368c3422508
Diffstat (limited to 'androidmk')
-rw-r--r--androidmk/cmd/androidmk/androidmk.go4
-rw-r--r--androidmk/cmd/androidmk/androidmk_test.go4
2 files changed, 4 insertions, 4 deletions
diff --git a/androidmk/cmd/androidmk/androidmk.go b/androidmk/cmd/androidmk/androidmk.go
index 0426b43f..d2a84d13 100644
--- a/androidmk/cmd/androidmk/androidmk.go
+++ b/androidmk/cmd/androidmk/androidmk.go
@@ -208,7 +208,7 @@ func convertFile(filename string, buffer *bytes.Buffer) (string, []error) {
file.errorf(x, "missing if before else")
continue
} else if conds[len(conds)-1] == nil {
- file.errorf(x, "else from unsupported contitional")
+ file.errorf(x, "else from unsupported conditional")
continue
}
conds[len(conds)-1].eq = !conds[len(conds)-1].eq
@@ -217,7 +217,7 @@ func convertFile(filename string, buffer *bytes.Buffer) (string, []error) {
file.errorf(x, "missing if before endif")
continue
} else if conds[len(conds)-1] == nil {
- file.errorf(x, "endif from unsupported contitional")
+ file.errorf(x, "endif from unsupported conditional")
conds = conds[:len(conds)-1]
} else {
if assignmentCond == conds[len(conds)-1] {
diff --git a/androidmk/cmd/androidmk/androidmk_test.go b/androidmk/cmd/androidmk/androidmk_test.go
index 8ba3181d..2cbfd012 100644
--- a/androidmk/cmd/androidmk/androidmk_test.go
+++ b/androidmk/cmd/androidmk/androidmk_test.go
@@ -504,9 +504,9 @@ endif # b==false
// # b==false
// echo end
//
-// ANDROIDMK TRANSLATION ERROR: endif from unsupported contitional
+// ANDROIDMK TRANSLATION ERROR: endif from unsupported conditional
// endif
-// ANDROIDMK TRANSLATION ERROR: endif from unsupported contitional
+// ANDROIDMK TRANSLATION ERROR: endif from unsupported conditional
// endif
`,
},