From d08b697828315502b34deed28307f6e4663342ec Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Tue, 26 Sep 2017 10:50:54 +0900 Subject: Allow macro definition with space cflags: ["-DMACRO=\" definition \""] should not be rejected. Bug: 66914194 Test: TestCompilerFlags in cc_test.go Change-Id: I7f96505a83898616415ef1fb7e13596b56a063f3 --- cc/check.go | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'cc/check.go') diff --git a/cc/check.go b/cc/check.go index d04b1459..4e9e1608 100644 --- a/cc/check.go +++ b/cc/check.go @@ -50,6 +50,11 @@ func CheckBadCompilerFlags(ctx BaseModuleContext, prop string, flags []string) { } else if strings.HasPrefix("../", path) { ctx.PropertyErrorf(prop, "Path must not start with `../`: `%s`. Use include_dirs to -include from a different directory", flag) } + } else if strings.HasPrefix(flag, "-D") && strings.Contains(flag, "=") { + // Do nothing in this case. + // For now, we allow space characters in -DNAME=def form to allow use cases + // like -DNAME="value with string". Later, this check should be done more + // correctly to prevent multi flag cases like -DNAME=value -O2. } else { ctx.PropertyErrorf(prop, "Bad flag: `%s` is not an allowed multi-word flag. Should it be split into multiple flags?", flag) } -- cgit v1.2.3