Index: build/android/lint_action.gypi |
diff --git a/build/android/lint_action.gypi b/build/android/lint_action.gypi |
index 5369f640b016d980371a15285b3bc92ddefe40cf..35b7d491a4b428ccd655dd1f17bb34ee666eaf3b 100644 |
--- a/build/android/lint_action.gypi |
+++ b/build/android/lint_action.gypi |
@@ -11,9 +11,9 @@ |
'variables': { |
'conditions': [ |
['chromium_code != 0 and android_lint != 0 and never_lint == 0', { |
- 'is_enabled': '--enable', |
+ 'additional_args': ['--enable'], |
}, { |
- 'is_enabled': '', |
+ 'additional_args': [], |
}] |
], |
'android_manifest_path%': '<(DEPTH)/build/android/AndroidManifest.xml', |
@@ -24,14 +24,16 @@ |
'<(DEPTH)/build/android/gyp/util/build_utils.py', |
'<(DEPTH)/build/android/gyp/lint.py', |
'<(android_manifest_path)', |
- '<(suppressions_file)', |
'<(lint_jar_path)', |
+ '<(suppressions_file)', |
], |
'action': [ |
'python', '<(DEPTH)/build/android/gyp/lint.py', |
'--lint-path=<(android_sdk_root)/tools/lint', |
'--config-path=<(suppressions_file)', |
'--processed-config-path=<(config_path)', |
+ '--cache-dir', '<(PRODUCT_DIR)/android_lint_cache', |
+ '--build-tools-version', '<(android_sdk_build_tools_version)', |
'--manifest-path=<(android_manifest_path)', |
'--result-path=<(result_path)', |
'--resource-dir=<(resource_dir)', |
@@ -40,6 +42,6 @@ |
'--jar-path=<(lint_jar_path)', |
'--can-fail-build', |
'--stamp=<(stamp_path)', |
- '<(is_enabled)', |
+ '<@(additional_args)', |
], |
} |