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

Unified Diff: testing/chromoting/integration_tests.gyp

Issue 717643002: Build me2me host debian package as part of Chromoting integration test target. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
« remoting/remoting_host_linux.gypi ('K') | « remoting/remoting_host_linux.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/chromoting/integration_tests.gyp
diff --git a/testing/chromoting/integration_tests.gyp b/testing/chromoting/integration_tests.gyp
index 23fcf6ff9d69bdef72ef9b50a09cb9acfa5937ab..fb9d05cc3eb73deb24a893dd9e518f65c74ce570 100644
--- a/testing/chromoting/integration_tests.gyp
+++ b/testing/chromoting/integration_tests.gyp
@@ -4,7 +4,7 @@
{
'conditions': [
- ['archive_chromoting_tests==1', {
+ ['OS!="linux" and archive_chromoting_tests==1', {
'targets': [
{
'target_name': 'chromoting_integration_tests_run',
@@ -23,5 +23,25 @@
},
],
}],
+ ['OS=="linux" and archive_chromoting_tests==1', {
+ 'targets': [
+ {
+ 'target_name': 'chromoting_integration_tests_run',
+ 'type': 'none',
+ 'dependencies': [
+ '../../chrome/chrome.gyp:browser_tests',
+ '../../remoting/remoting.gyp:remoting_webapp_v1',
+ '../../remoting/remoting.gyp:remoting_webapp_v2',
+ '../../remoting/remoting.gyp:remoting_me2me_host_archive',
Lambros 2014/11/12 02:06:02 This line is the only thing that is changed, so yo
anandc 2014/11/12 21:50:35 Done.
+ ],
+ 'includes': [
+ '../../build/isolate.gypi',
+ ],
+ 'sources': [
+ 'chromoting_integration_tests.isolate',
+ ],
+ },
+ ],
+ }],
],
}
« remoting/remoting_host_linux.gypi ('K') | « remoting/remoting_host_linux.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698