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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome.gyp

Issue 10918113: Add initial Chromium TestShell support for Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove commented out lines. Created 8 years, 3 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 | « chrome/browser/chrome_browser_main_android.cc ('k') | chrome/chrome_android.gypi » ('j') | 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 b4fab768f1c2ff338ad363fbb8e2d24736b7b8c1..afce69febf54ed2ea2d254f05f916b919624ef1c 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1090,9 +1090,14 @@
'package_name': 'chrome',
'java_in_dir': '../chrome/android/java',
},
- 'includes': [ '../build/java.gypi' ],
+ 'includes': [
+ '../build/java.gypi',
+ ],
},
- ]}, # 'targets'
+ ], # 'targets'
+ 'includes': [
+ 'chrome_android.gypi',
+ ]}, # 'includes'
], # OS=="android"
], # 'conditions'
}
« no previous file with comments | « chrome/browser/chrome_browser_main_android.cc ('k') | chrome/chrome_android.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698