Revert of 🌈 Android: Run lint using a cache in the output directory (fix-up)

build/android/gyp/lint.py

 #!/usr/bin/env python
 #
 # Copyright (c) 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.
 
 """Runs Android's lint tool."""
 
 
 import argparse
@@ skipping 112 matching lines @@
         src_dir = NewSourceDir()
       os.symlink(os.path.abspath(src), PathInDir(src_dir, src))
 
     if manifest_path:
       cmd.append(_RelativizePath(os.path.join(manifest_path, os.pardir)))
 
     if os.path.exists(result_path):
       os.remove(result_path)
 
     env = {}
-    stderr_filter = None
     if cache_dir:
-      # When _JAVA_OPTIONS is set, java prints to stderr:
-      # Picked up _JAVA_OPTIONS: ...
       env['_JAVA_OPTIONS'] = '-Duser.home=%s' % _RelativizePath(cache_dir)
-      stderr_filter = lambda l: '' if '_JAVA_OPTIONS' in l else l
 
     try:
-      build_utils.CheckOutput(cmd, cwd=_SRC_ROOT, env=env or None,
-                              stderr_filter=stderr_filter)
+      build_utils.CheckOutput(cmd, cwd=_SRC_ROOT, env=env or None)
     except build_utils.CalledProcessError:
       if can_fail_build:
         traceback.print_exc()
 
       # There is a problem with lint usage
       if not os.path.exists(result_path):
         raise
 
       # There are actual lint issues
       else:
@@ skipping 35 matching lines @@
   parser.add_argument('--product-dir', required=True,
                       help='Path to product dir.')
   parser.add_argument('--result-path', required=True,
                       help='Path to XML lint result file.')
 
   parser.add_argument('--build-tools-version',
                       help='Version of the build tools in the Android SDK.')
   parser.add_argument('--cache-dir',
                       help='Path to the directory in which the android cache '
                            'directory tree should be stored.')
-  parser.add_argument('--create-cache', action='store_true',
-                      help='Mark the lint cache file as an output rather than '
-                      'an input.')
   parser.add_argument('--can-fail-build', action='store_true',
                       help='If set, script will exit with nonzero exit status'
                            ' if lint errors are present')
   parser.add_argument('--config-path',
                       help='Path to lint suppressions file.')
   parser.add_argument('--enable', action='store_true',
                       help='Run lint instead of just touching stamp.')
   parser.add_argument('--jar-path',
                       help='Jar file containing class files.')
   parser.add_argument('--java-files',
@@ skipping 45 matching lines @@
       input_paths.extend(sources)
 
     input_strings = []
     if args.processed_config_path:
       input_strings.append(args.processed_config_path)
 
     output_paths = [ args.result_path ]
     if args.cache_dir:
       if not args.build_tools_version:
         parser.error('--cache-dir specified without --build-tools-version')
-      _cache_file = os.path.join(
-            args.cache_dir, '.android', 'cache',
-            'api-versions-6-%s.bin' % args.build_tools_version)
-      if args.create_cache:
-        output_paths.append(_cache_file)
-      else:
-        input_paths.append(_cache_file)
+      output_paths.append(os.path.join(
+          args.cache_dir, '.android', 'cache',
+          'api-versions-6-%s.bin' % args.build_tools_version))
 
     build_utils.CallAndWriteDepfileIfStale(
         lambda changes: _OnStaleMd5(changes, args.lint_path,
                                     args.config_path,
                                     args.processed_config_path,
                                     args.manifest_path, args.result_path,
                                     args.product_dir, sources,
                                     args.jar_path,
                                     args.cache_dir,
                                     resource_dir=args.resource_dir,
                                     can_fail_build=args.can_fail_build,
                                     silent=args.silent),
         args,
         input_paths=input_paths,
         input_strings=input_strings,
         output_paths=output_paths,
         pass_changes=True)
 
 
 if __name__ == '__main__':
   sys.exit(main())