Index: build/android/gyp/lint.py |
diff --git a/build/android/gyp/lint.py b/build/android/gyp/lint.py |
index 9402780b094d3637943779fa0a61b9a4fe2b0192..6c4645abeabb3607108ed5d590d5dffc10e60013 100755 |
--- a/build/android/gyp/lint.py |
+++ b/build/android/gyp/lint.py |
@@ -20,8 +20,7 @@ _SRC_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), |
def _RunLint(lint_path, config_path, processed_config_path, manifest_path, |
- result_path, product_dir, sources, jar_path, resource_dir=None, |
- can_fail_build=False): |
+ result_path, product_dir, sources, jar_path, resource_dir=None): |
def _RelativizePath(path): |
"""Returns relative path to top-level src dir. |
@@ -122,7 +121,7 @@ def _RunLint(lint_path, config_path, processed_config_path, manifest_path, |
if not os.path.exists(result_path): |
print 'Something is wrong:' |
print e |
- return 0 |
+ return 1 |
# There are actual lint issues |
else: |
@@ -133,7 +132,7 @@ def _RunLint(lint_path, config_path, processed_config_path, manifest_path, |
print 'File contents:' |
with open(result_path) as f: |
print f.read() |
- return 0 |
+ return 1 |
_ProcessResultFile() |
msg = ('\nLint found %d new issues.\n' |
@@ -148,7 +147,7 @@ def _RunLint(lint_path, config_path, processed_config_path, manifest_path, |
'lint', 'suppress.py')), |
_RelativizePath(result_path))) |
print >> sys.stderr, msg |
- return 1 if can_fail_build else 0 |
+ return 1 |
return 0 |
@@ -198,7 +197,7 @@ def main(): |
options.processed_config_path, |
options.manifest_path, options.result_path, |
options.product_dir, sources, options.jar_path, |
- options.resource_dir, options.can_fail_build) |
+ options.resource_dir) |
if options.depfile: |
build_utils.WriteDepfile( |
@@ -208,7 +207,7 @@ def main(): |
if options.stamp and not rc: |
build_utils.Touch(options.stamp) |
- return rc |
+ return rc if options.can_fail_build else 0 |
if __name__ == '__main__': |