Revert of Mirror images for RTL languages at build time.

build/android/gyp/process_resources.py

 #!/usr/bin/env python
 #
-# Copyright 2012 The Chromium Authors. All rights reserved.
+# 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 library resources to generate R.java and crunched images."""
 
 import optparse
 import os
 import shlex
 import shutil
-import tempfile
 
 from util import build_utils
-import mirror_images
 
 def ParseArgs():
   """Parses command line options.
 
   Returns:
     An options object as from optparse.OptionsParser.parse_args()
   """
   parser = optparse.OptionParser()
   parser.add_option('--android-sdk', help='path to the Android SDK folder')
   parser.add_option('--android-sdk-tools',
                     help='path to the Android SDK build tools folder')
   parser.add_option('--R-dir', help='directory to hold generated R.java')
   parser.add_option('--res-dirs',
                     help='directories containing resources to be packaged')
-  parser.add_option('--image-input-dir', help='directory containing images to '
-                    'be crunched and possibly mirrored.')
+  parser.add_option('--crunch-input-dir',
+                    help='directory containing images to be crunched')
   parser.add_option('--crunch-output-dir',
                     help='directory to hold crunched resources')
-  parser.add_option('--mirror-config', help='config file specifying which '
-                    'images should be mirrored. Images will be mirrored only '
-                    'if this is provided.')
-  parser.add_option('--mirror-output-dir',
-                    help='directory where mirrored images should be saved')
   parser.add_option('--non-constant-id', action='store_true')
   parser.add_option('--custom-package', help='Java package for R.java')
   parser.add_option('--android-manifest', help='AndroidManifest.xml path')
   parser.add_option('--stamp', help='File to touch on success')
 
   # This is part of a temporary fix for crbug.com/177552.
   # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
   parser.add_option('--ignore', help='this argument is ignored')
   (options, args) = parser.parse_args()
 
   if args:
     parser.error('No positional arguments should be given.')
 
-  if (options.mirror_config is None) != (options.mirror_output_dir is None):
-    parser.error('--mirror-config and --mirror-output-dir must both be present '
-                 'or neither present.')
-
   # Check that required options have been provided.
   required_options = ('android_sdk', 'android_sdk_tools', 'R_dir',
-                      'res_dirs', 'image_input_dir', 'crunch_output_dir')
+                      'res_dirs', 'crunch_input_dir', 'crunch_output_dir')
   build_utils.CheckOptions(options, parser, required=required_options)
 
   return options
 
 
 def MoveImagesToNonMdpiFolders(res_root):
   """Move images from drawable-*-mdpi-* folders to drawable-* folders.
 
   Why? http://crbug.com/289843
   """
@@ skipping 11 matching lines @@
     build_utils.MakeDirectory(dst_dir)
     for src_file_name in os.listdir(src_dir):
       if not src_file_name.endswith('.png'):
         continue
       src_file = os.path.join(src_dir, src_file_name)
       dst_file = os.path.join(dst_dir, src_file_name)
       assert not os.path.lexists(dst_file)
       shutil.move(src_file, dst_file)
 
 
-def CrunchImages(aapt, input_res_dir, output_res_dir):
-  build_utils.MakeDirectory(output_res_dir)
-  aapt_cmd = [aapt,
-              'crunch',
-              '-S', input_res_dir,
-              '-C', output_res_dir]
-  build_utils.CheckOutput(aapt_cmd, fail_if_stderr=True)
-
-
 def main():
   options = ParseArgs()
   android_jar = os.path.join(options.android_sdk, 'android.jar')
   aapt = os.path.join(options.android_sdk_tools, 'aapt')
 
   build_utils.MakeDirectory(options.R_dir)
 
   # Generate R.java. This R.java contains non-final constants and is used only
   # while compiling the library jar (e.g. chromium_content.jar). When building
   # an apk, a new R.java file with the correct resource -> ID mappings will be
   # generated by merging the resources from all libraries and the main apk
   # project.
   package_command = [aapt,
                      'package',
                      '-m',
                      '-M', options.android_manifest,
                      '--auto-add-overlay',
                      '-I', android_jar,
                      '--output-text-symbols', options.R_dir,
                      '-J', options.R_dir]
   res_dirs = shlex.split(options.res_dirs)
   for res_dir in res_dirs:
     package_command += ['-S', res_dir]
   if options.non_constant_id:
     package_command.append('--non-constant-id')
   if options.custom_package:
     package_command += ['--custom-package', options.custom_package]
   build_utils.CheckOutput(package_command)
 
-  # Mirror images if requested.
-  if options.mirror_config:
-    # Mirrored images are generated into a temp dir. Once these images are
-    # crunched, they'll go in the desired mirror output dir.
-    mirrored_uncrunched_dir = tempfile.mkdtemp()
-    try:
-      mirror_images.main(['--config', options.mirror_config,
-                          '--input-res-dir', options.image_input_dir,
-                          '--output-res-dir', mirrored_uncrunched_dir])
-      CrunchImages(aapt, mirrored_uncrunched_dir, options.mirror_output_dir)
-    finally:
-      shutil.rmtree(mirrored_uncrunched_dir)
-
   # Crunch image resources. This shrinks png files and is necessary for 9-patch
   # images to display correctly.
-  CrunchImages(aapt, options.image_input_dir, options.crunch_output_dir)
+  build_utils.MakeDirectory(options.crunch_output_dir)
+  aapt_cmd = [aapt,
+              'crunch',
+              '-S', options.crunch_input_dir,
+              '-C', options.crunch_output_dir]
+  build_utils.CheckOutput(aapt_cmd, fail_if_stderr=True)
+
+  MoveImagesToNonMdpiFolders(options.crunch_output_dir)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':
   main()