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

Unified Diff: build/android/lint_action.gypi

Issue 880083004: Change which manifest and resources are passed to lint.py. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added resource_dir to chrome_java target. Created 5 years, 10 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
Index: build/android/lint_action.gypi
diff --git a/build/android/lint_action.gypi b/build/android/lint_action.gypi
index 186d64c4fa28ea9512eed8049fdce4c6d26e4c8e..1ade0e35a50db96db114cb586148b9bc3a0af646 100644
--- a/build/android/lint_action.gypi
+++ b/build/android/lint_action.gypi
@@ -15,13 +15,14 @@
}, {
'is_enabled': '',
}]
- ]
+ ],
+ 'android_manifest_path%': '<(DEPTH)/build/android/AndroidManifest.xml',
+ 'resource_dir%': '<(DEPTH)/build/android/ant/empty/res',
},
'inputs': [
'<(DEPTH)/build/android/gyp/util/build_utils.py',
'<(DEPTH)/build/android/gyp/lint.py',
'<(DEPTH)/build/android/lint/suppressions.xml',
- '<(DEPTH)/build/android/AndroidManifest.xml',
'<(lint_jar_path)',
],
'action': [
@@ -29,8 +30,9 @@
'--lint-path=<(android_sdk_root)/tools/lint',
'--config-path=<(DEPTH)/build/android/lint/suppressions.xml',
'--processed-config-path=<(config_path)',
- '--manifest-path=<(DEPTH)/build/android/AndroidManifest.xml',
+ '--manifest-path=<(android_manifest_path)',
'--result-path=<(result_path)',
+ '--resource-dir=<(resource_dir)',
'--product-dir=<(PRODUCT_DIR)',
'--src-dirs=>(src_dirs)',
'--jar-path=<(lint_jar_path)',
« no previous file with comments | « build/android/lint/suppressions.xml ('k') | chrome/chrome.gyp » ('j') | chrome/chrome.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698