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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/all_android.gyp

Issue 10943014: Add support for the ChromiumTestShellTest APK. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed Comments 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/javatests/src/org/chromium/chrome/browser/test/DummyIntegrationTest.java » ('j') | chrome/android/testshell/java/chromium_testshell_apk.xml » ('J')
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 3d215ab946a8c1b11ee4877f83ed3b7c1ef172b8..5112682cb31c822ab2f525685b66db2b8457e21b 100644
--- a/build/all_android.gyp
+++ b/build/all_android.gyp
@@ -70,6 +70,11 @@
'../chrome/chrome_resources.gyp:packed_resources',
],
'conditions': [
+ ['sdk_build==1', {
+ 'dependencies': [
+ '../chrome/chrome.gyp:chromium_testshell_test_apk',
+ ],
+ }], # sdk_build==1
['linux_breakpad==1', {
'dependencies': [
'../breakpad/breakpad.gyp:breakpad_unittests',
@@ -94,7 +99,7 @@
'../sync/sync.gyp:sync_unit_tests_apk',
'../ui/ui.gyp:ui_unittests_apk',
],
- }]
+ }],
],
},
{
« no previous file with comments | « no previous file | chrome/android/javatests/src/org/chromium/chrome/browser/test/DummyIntegrationTest.java » ('j') | chrome/android/testshell/java/chromium_testshell_apk.xml » ('J')

Powered by Google App Engine
This is Rietveld 408576698