Index: build/all.gyp |
diff --git a/build/all.gyp b/build/all.gyp |
index b469a2220307a9a576a8291eb88d9121f7cef67e..f421983b80ffa74cb8c7f6e4299bf933baa332f5 100644 |
--- a/build/all.gyp |
+++ b/build/all.gyp |
@@ -98,7 +98,6 @@ |
['OS!="ios" and OS!="android"', { |
'dependencies': [ |
'../third_party/re2/re2.gyp:re2', |
- '../chrome/chrome.gyp:*', |
'../chrome/tools/profile_reset/jtl_compiler.gyp:*', |
'../cc/blink/cc_blink_tests.gyp:*', |
'../cc/cc_tests.gyp:*', |
@@ -143,6 +142,21 @@ |
'../v8/tools/gyp/v8.gyp:*', |
'<(libjpeg_gyp_path):*', |
], |
+ 'conditions': [ |
+ ['use_athena==1' , { |
+ 'dependencies': [ |
+ # Athena temporarily depends upon a subset of chrome. Since most |
+ # tests do not compile, we only include dependencies to tests we |
+ # want to build. |
+ '../chrome/chrome.gyp:chrome', |
+ '../chrome/chrome.gyp:browser_tests', |
+ ] |
+ }, { |
+ 'dependencies': [ |
+ '../chrome/chrome.gyp:*', |
+ ], |
+ }], |
+ ], |
}], |
['OS=="mac" or OS=="ios" or OS=="win"', { |
'dependencies': [ |
@@ -305,8 +319,6 @@ |
'../chrome/chrome.gyp:chromedriver_tests', |
'../chrome/chrome.gyp:chromedriver_unittests', |
'../chrome/chrome.gyp:interactive_ui_tests', |
- '../chrome/chrome.gyp:sync_integration_tests', |
- '../chrome/chrome.gyp:unit_tests', |
'../cloud_print/cloud_print.gyp:cloud_print_unittests', |
'../content/content_shell_and_tests.gyp:content_browsertests', |
'../content/content_shell_and_tests.gyp:content_shell', |
@@ -332,6 +344,14 @@ |
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', |
'../tools/telemetry/telemetry.gyp:*', |
], |
+ 'conditions': [ |
+ ['use_athena!=1', { |
+ 'dependencies' : [ |
+ '../chrome/chrome.gyp:sync_integration_tests', |
+ '../chrome/chrome.gyp:unit_tests', |
+ ], |
+ }], |
+ ], |
}], |
['OS=="win"', { |
'dependencies': [ |
@@ -1211,8 +1231,6 @@ |
'../cc/cc_tests.gyp:cc_unittests', |
'../chrome/chrome.gyp:browser_tests', |
'../chrome/chrome.gyp:chrome', |
- '../chrome/chrome.gyp:interactive_ui_tests', |
- '../chrome/chrome.gyp:unit_tests', |
'../components/components_tests.gyp:components_unittests', |
'../content/content_shell_and_tests.gyp:content_browsertests', |
'../content/content_shell_and_tests.gyp:content_unittests', |
@@ -1238,6 +1256,12 @@ |
'blink_tests', |
], |
'conditions': [ |
+ ['use_athena!=1', { |
+ 'dependencies': [ |
+ '../chrome/chrome.gyp:interactive_ui_tests', |
+ '../chrome/chrome.gyp:unit_tests', |
+ ], |
+ }], |
['OS=="win"', { |
'dependencies': [ |
'../chrome/chrome.gyp:crash_service', |
@@ -1302,13 +1326,19 @@ |
'dependencies': [ |
'../base/base.gyp:base_unittests_run', |
'../chrome/chrome.gyp:browser_tests_run', |
- '../chrome/chrome.gyp:interactive_ui_tests_run', |
- '../chrome/chrome.gyp:sync_integration_tests_run', |
- '../chrome/chrome.gyp:unit_tests_run', |
'../content/content_shell_and_tests.gyp:content_browsertests_run', |
'../content/content_shell_and_tests.gyp:content_unittests_run', |
'../net/net.gyp:net_unittests_run', |
], |
+ 'conditions' : [ |
+ ['use_athena!=1', { |
+ 'dependencies': [ |
+ '../chrome/chrome.gyp:interactive_ui_tests_run', |
+ '../chrome/chrome.gyp:sync_integration_tests_run', |
+ '../chrome/chrome.gyp:unit_tests_run', |
+ ], |
+ }], |
+ ], |
}, # target_name: chromium_swarm_tests |
], |
}], |