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

Unified Diff: build/all_android.gyp

Issue 10905209: Revert "Revert 155950 - Add initial Chromium TestShell support for Android" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add launcher property to apk manifest 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 | « no previous file | chrome/android/testshell/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all_android.gyp
diff --git a/build/all_android.gyp b/build/all_android.gyp
index 84345dc140c146bc9b87290de82bf555a7b8b7c2..c4ade0708230590a24962ab85b43855244b0441e 100644
--- a/build/all_android.gyp
+++ b/build/all_android.gyp
@@ -22,6 +22,13 @@
'<@(android_app_targets)',
'android_builder_tests',
],
+ 'conditions': [
+ ['sdk_build==1', {
+ 'dependencies': [
+ '../chrome/chrome.gyp:chromium_testshell',
+ ],
+ }], # sdk_build==1
+ ], # conditions
}, # target_name: All
{
# The current list of tests for android. This is temporary
« no previous file with comments | « no previous file | chrome/android/testshell/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698