Ignore "libpng: unknown profile" warnings when running aapt crunch.

build/android/gyp/process_resources.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012 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.
 
 """Process Android resources to generate R.java, and prepare for packaging.
 
 This will crunch images and generate v14 compatible resources
 (see generate_v14_compatible_resources.py).
@@ skipping 102 matching lines @@
     build_utils.MakeDirectory(package_r_java_dir)
     package_r_java_path = os.path.join(package_r_java_dir, 'R.java')
     open(package_r_java_path, 'w').write(
         re.sub(r'package [.\w]*;', 'package %s;' % package, r_java_contents))
     # TODO(cjhopman): These extra package's R.java files should be filtered to
     # only contain the resources listed in their R.txt files. At this point, we
     # have already compiled those other libraries, so doing this would only
     # affect how the code in this .apk target could refer to the resources.
 
 
+def FilterCrunchStderr(stderr):
+  """Filters out lines from aapt crunch's stderr that can safely be ignored."""
+  filtered_lines = []
+  for line in stderr.splitlines(True):
+    # Ignore this libpng warning, which is a known non-error condition.
+    # http://crbug.com/364355
+    if ('libpng warning: iCCP: Not recognizing known sRGB profile that has '
+        + 'been edited' in line):
+      continue
+    filtered_lines.append(line)
+  return ''.join(filtered_lines)
+
+
 def DidCrunchFail(returncode, stderr):
   """Determines whether aapt crunch failed from its return code and output.
 
   Because aapt's return code cannot be trusted, any output to stderr is
-  an indication that aapt has failed (http://crbug.com/314885), except
-  lines that contain "libpng warning", which is a known non-error condition
-  (http://crbug.com/364355).
+  an indication that aapt has failed (http://crbug.com/314885).
   """
-  if returncode != 0:
-    return True
-  for line in stderr.splitlines():
-    if line and not 'libpng warning' in line:
-      return True
-  return False
+  return returncode != 0 or stderr
 
 
 def ZipResources(resource_dirs, zip_path):
   # Python zipfile does not provide a way to replace a file (it just writes
   # another file with the same name). So, first collect all the files to put
   # in the zip (with proper overriding), and then zip them.
   files_to_zip = dict()
   for d in resource_dirs:
     for root, _, files in os.walk(d):
       for f in files:
@@ skipping 99 matching lines @@
     # 9-patch images to display correctly. 'aapt crunch' accepts only a single
     # directory at a time and deletes everything in the output directory.
     for idx, d in enumerate(input_resource_dirs):
       crunch_dir = os.path.join(base_crunch_dir, str(idx))
       build_utils.MakeDirectory(crunch_dir)
       zip_resource_dirs.append(crunch_dir)
       aapt_cmd = [aapt,
                   'crunch',
                   '-C', crunch_dir,
                   '-S', d]
-      build_utils.CheckOutput(aapt_cmd, fail_func=DidCrunchFail)
+      build_utils.CheckOutput(aapt_cmd, stderr_filter=FilterCrunchStderr,
+                              fail_func=DidCrunchFail)
 
     ZipResources(zip_resource_dirs, options.resource_zip_out)
 
     if options.all_resources_zip_out:
       CombineZips([options.resource_zip_out] + dep_zips,
                   options.all_resources_zip_out)
 
     if options.R_dir:
       build_utils.DeleteDirectory(options.R_dir)
       shutil.copytree(gen_dir, options.R_dir)
     else:
       build_utils.ZipDir(options.srcjar_out, gen_dir)
 
   if options.depfile:
     input_files += build_utils.GetPythonDependencies()
     build_utils.WriteDepfile(options.depfile, input_files)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':
   main()