summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-06 21:41:00 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-06 21:41:00 +0000
commit06bd4bfd6d9f306c8daf7f618d028f4c67441128 (patch)
treee33144911fa08ac83addac68f1c8cb480072177c
parenta4c03d376e9c513f5fba91799b94e65d49c9cbe1 (diff)
downloadchromium_src-06bd4bfd6d9f306c8daf7f618d028f4c67441128.zip
chromium_src-06bd4bfd6d9f306c8daf7f618d028f4c67441128.tar.gz
chromium_src-06bd4bfd6d9f306c8daf7f618d028f4c67441128.tar.bz2
android: Remove unneeded md5sum class for jar.py and jar_toc.py.
Both actions have a small fixed list of inputs. md5sum is only needed for variable input lists (see bug). No behavior change. BUG=177552 R=cjhopman@chromium.org Review URL: https://codereview.chromium.org/184103038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255436 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xbuild/android/gyp/jar.py3
-rwxr-xr-xbuild/android/gyp/jar_toc.py3
-rw-r--r--build/java.gypi6
-rw-r--r--build/java_apk.gypi5
4 files changed, 1 insertions, 16 deletions
diff --git a/build/android/gyp/jar.py b/build/android/gyp/jar.py
index cf731cd..fdcd4b2 100755
--- a/build/android/gyp/jar.py
+++ b/build/android/gyp/jar.py
@@ -46,9 +46,6 @@ def main(argv):
help='List of .class file patterns to exclude from the jar.')
parser.add_option('--stamp', help='Path to touch on success.')
- # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja.
- parser.add_option('--ignore', help='Ignored.')
-
options, _ = parser.parse_args()
DoJar(options)
diff --git a/build/android/gyp/jar_toc.py b/build/android/gyp/jar_toc.py
index 9baa8e57..ca3152f 100755
--- a/build/android/gyp/jar_toc.py
+++ b/build/android/gyp/jar_toc.py
@@ -97,9 +97,6 @@ def main(argv):
parser.add_option('--toc-path', help='Output .jar.TOC path.')
parser.add_option('--stamp', help='Path to touch on success.')
- # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja.
- parser.add_option('--ignore', help='Ignored.')
-
options, _ = parser.parse_args()
DoJarToc(options)
diff --git a/build/java.gypi b/build/java.gypi
index 73d33d6..67ff12c 100644
--- a/build/java.gypi
+++ b/build/java.gypi
@@ -344,9 +344,6 @@
'--classes-dir=<(classes_dir)',
'--jar-path=<(javac_jar_path)',
'--excluded-classes=<(jar_excluded_classes)',
-
- # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja.
- '--ignore=>!(echo \'>(_inputs)\' | md5sum)',
]
},
{
@@ -382,9 +379,6 @@
'python', '<(DEPTH)/build/android/gyp/jar_toc.py',
'--jar-path=<(jar_final_path)',
'--toc-path=<(jar_final_path).TOC',
-
- # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja.
- '--ignore=>!(echo \'>(_inputs)\' | md5sum)',
]
},
{
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index b4dbb72..92e1d2a 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -592,10 +592,10 @@
'action_name': 'jar_<(_target_name)',
'message': 'Creating <(_target_name) jar',
'inputs': [
- '<(instr_stamp)',
'<(DEPTH)/build/android/gyp/util/build_utils.py',
'<(DEPTH)/build/android/gyp/util/md5_check.py',
'<(DEPTH)/build/android/gyp/jar.py',
+ '<(instr_stamp)',
],
'outputs': [
'<(jar_stamp)',
@@ -606,9 +606,6 @@
'--jar-path=<(jar_path)',
'--excluded-classes=<(jar_excluded_classes)',
'--stamp=<(jar_stamp)',
-
- # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja.
- '--ignore=>!(echo \'>(_inputs)\' | md5sum)',
]
},
{