Don't swallow "aapt crunch" build errors.

build/android/gyp/util/build_utils.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import fnmatch
 import json
 import os
 import pipes
 import shlex
 import shutil
@@ skipping 65 matching lines @@
 def ReadJson(path):
   with open(path, 'r') as jsonfile:
     return json.load(jsonfile)
 
 
 # This can be used in most cases like subprocess.check_call. The output,
 # particularly when the command fails, better highlights the command's failure.
 # This call will directly exit on a failure in the subprocess so that no python
 # stacktrace is printed after the output of the failed command (and will
 # instead print a python stack trace before the output of the failed command)
-def CheckCallDie(args, suppress_output=False, cwd=None):
+def CheckCallDie(args, suppress_output=False, cwd=None, fail_if_stderr=False):
   if not cwd:
     cwd = os.getcwd()
 
   child = subprocess.Popen(args,
-      stdout=subprocess.PIPE, stderr=subprocess.STDOUT, cwd=cwd)
+      stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=cwd)
 
-  stdout, _ = child.communicate()
+  stdout, stderr = child.communicate()
 
-  if child.returncode:
+  returncode = child.returncode
+  if fail_if_stderr and stderr and returncode == 0:
+    returncode = 1
+
+  if returncode:
     stacktrace = traceback.extract_stack()
     print >> sys.stderr, ''.join(traceback.format_list(stacktrace))
     # A user should be able to simply copy and paste the command that failed
     # into their shell.
     copyable_command = ' '.join(map(pipes.quote, args))
     copyable_command = ('( cd ' + os.path.abspath(cwd) + '; '
         + copyable_command + ' )')
     print >> sys.stderr, 'Command failed:', copyable_command, '\n'
 
     if stdout:
       print stdout,
+    if stderr:
+      print >> sys.stderr, stderr,
 
     # Directly exit to avoid printing stacktrace.
-    sys.exit(child.returncode)
+    sys.exit(returncode)
 
   else:
-    if stdout and not suppress_output:
-      print stdout,
-    return stdout
+    if not suppress_output:
+      if stdout:
+        print stdout,
+      if stderr:
+        print >> sys.stderr, stderr,
+    return stdout + stderr

[cjhopman, 2013/11/05 01:10:45]

This might screw up the log quietening in ant.py. If it does, we'll probably
need to return these without concatenation and handle it there.

[newt (away), 2013/11/05 15:28:41]

Yes, we might need to readjust, though I think the only thing this changes is
the interleaving of stdout and stderr. Previously, we redirected stderr to
stdout, so "return stdout" actually returned both streams, but interleaved
instead of concatenated. Still, it's possible some error messages will be
confusing with this new order. Let's find out :)

 
 
 def GetModifiedTime(path):
   # For a symlink, the modified time should be the greater of the link's
   # modified time and the modified time of the target.
   return max(os.lstat(path).st_mtime, os.stat(path).st_mtime)
 
 
 def IsTimeStale(output, inputs):
   if not os.path.exists(output):
@@ skipping 12 matching lines @@
 
 
 def PrintWarning(message):
   print 'WARNING: ' + message
 
 
 def PrintBigWarning(message):
   print '*****     ' * 8
   PrintWarning(message)
   print '*****     ' * 8