Revert of CallAndRecordIfStale(): Add knownledge of output_files, depfiles, stamp

build/android/gyp/proguard.py

 #!/usr/bin/env python
 #
 # 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 optparse
 import os
 import sys
 
 from util import build_utils
+from util import md5_check
 from util import proguard_util
 
 
 def _ParseOptions(args):
   parser = optparse.OptionParser()
   build_utils.AddDepfileOption(parser)
   parser.add_option('--proguard-path',
                     help='Path to the proguard executable.')
   parser.add_option('--input-paths',
                     help='Paths to the .jar files proguard should run on.')
@@ skipping 30 matching lines @@
   if options.mapping:
     proguard.mapping(options.mapping)
 
   if options.is_test:
     proguard.is_test(True)
 
   classpath = list(set(options.classpath))
   proguard.libraryjars(classpath)
 
   input_paths = proguard.GetInputs()
+  python_deps = build_utils.GetPythonDependencies()
 
-  build_utils.CallAndWriteDepfileIfStale(
-      proguard.CheckOutput,
-      options,
+  def OnStaleMd5():
+    proguard.CheckOutput()
+
+    if options.depfile:
+      build_utils.WriteDepfile(options.depfile, python_deps + input_paths)
+    if options.stamp:
+      build_utils.Touch(options.stamp)
+
+  md5_check.CallAndRecordIfStale(
+      OnStaleMd5,
+      record_path=options.output_path + '.proguard.md5.stamp',
       input_paths=input_paths,
-      input_strings=proguard.build(),
-      output_paths=[options.output_path])
+      input_strings=proguard.build() + python_deps,
+      force=not os.path.exists(options.output_path))
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))