Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1322)

Unified Diff: build/android/gyp/proguard.py

Issue 1356873003: CallAndRecordIfStale(): Add knownledge of output_files, depfiles, stamp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@incremental-script-dep
Patch Set: add assert and remove map() Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/gyp/javac.py ('k') | build/android/gyp/util/build_utils.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/gyp/proguard.py
diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py
index 3e31667e3428304e152d6083e7eee0362159937d..5997f6125c50e4ec9ecc43201588ec5449c9057e 100755
--- a/build/android/gyp/proguard.py
+++ b/build/android/gyp/proguard.py
@@ -9,7 +9,6 @@ import os
import sys
from util import build_utils
-from util import md5_check
from util import proguard_util
@@ -60,22 +59,13 @@ def main(args):
proguard.libraryjars(classpath)
input_paths = proguard.GetInputs()
- python_deps = build_utils.GetPythonDependencies()
- 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',
+ build_utils.CallAndWriteDepfileIfStale(
+ proguard.CheckOutput,
+ options,
input_paths=input_paths,
- input_strings=proguard.build() + python_deps,
- force=not os.path.exists(options.output_path))
+ input_strings=proguard.build(),
+ output_paths=[options.output_path])
if __name__ == '__main__':
« no previous file with comments | « build/android/gyp/javac.py ('k') | build/android/gyp/util/build_utils.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698