Index: build/toolchain/mac/compile_xcassets.py |
diff --git a/build/toolchain/mac/compile_xcassets.py b/build/toolchain/mac/compile_xcassets.py |
index ac0742eb56f7800656b3f229681b14ae0baaa531..9b4110063140a1a6341f83bd69267efdca487703 100644 |
--- a/build/toolchain/mac/compile_xcassets.py |
+++ b/build/toolchain/mac/compile_xcassets.py |
@@ -55,13 +55,25 @@ def CompileXCAssets( |
# |
# Ignore any lines in the output matching those (last line is an empty line) |
# and consider that the build failed if the output contains any other lines. |
+ # |
+ # crbug.com/730054 Xcode 9's beta introduced a CoreUI(DEBUG) message followed |
+ # by a detail message that can be ignored. Presumably this will be removed |
+ # once Xcode 9 GMs. |
+ skip_next = False |
for line in stdout.splitlines(): |
+ if skip_next: |
+ skip_next = False |
sdefresne
2017/06/06 16:49:02
It looks like the next line is
2017-06-06 10:42:2
justincohen
2017/06/06 17:26:00
Are you sure we want to do this? I have no idea i
rohitrao (ping after 24h)
2017/06/06 18:09:46
I'd like to scope this as tightly to the actual er
justincohen
2017/06/06 20:03:04
Done.
|
+ continue |
if not line: |
continue |
if line == '/* com.apple.actool.compilation-results */': |
continue |
if line == os.path.abspath(output): |
continue |
+ if line.startswith('CoreUI(DEBUG)'): |
+ skip_next = True |
+ continue |
+ print line |
sdefresne
2017/06/06 16:49:02
I think this "print line" is debug and need to be
justincohen
2017/06/06 17:26:00
oops, thanks!
|
sys.stderr.write(stdout) |
sys.exit(1) |