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

Unified Diff: chrome/chrome.gyp

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
« no previous file with comments | « build/android/lint_action.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 7dc9de81a3a0dd6d1f67ce45835bb6296dc9f8cf..d2409e5c5e977c00d1de9235aede63a3125807b3 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -630,7 +630,8 @@
'../ui/android/ui_android.gyp:ui_java',
],
'variables': {
- 'java_in_dir': '../chrome/android/java',
+ 'java_in_dir': 'android/java',
+ 'resource_dir': 'android/java/res',
cjhopman 2015/02/05 19:48:28 This is really confusing. If you specify something
'has_java_resources': 1,
'R_package': 'org.chromium.chrome',
'R_package_relpath': 'org/chromium/chrome',
« no previous file with comments | « build/android/lint_action.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698