Chromium Code Reviews| Index: build/all.gyp |
| diff --git a/build/all.gyp b/build/all.gyp |
| index b469a2220307a9a576a8291eb88d9121f7cef67e..f201adcaabab9b38690f0173f72e5f4923bda1e9 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:*', |
| @@ -144,6 +143,20 @@ |
| '<(libjpeg_gyp_path):*', |
| ], |
| }], |
| + ['use_athena==1' , { |
| + 'dependencies': [ |
| + # Athena has to depend temporarily on Chrome. Since most tests do |
|
sky
2014/10/22 17:24:11
Your statement is a bit confusing. I think you mea
Mr4D (OOO till 08-26)
2014/10/22 23:39:31
Done.
|
| + # not compile, we only include dependencies to tests we want to |
| + # build. |
| + '../chrome/chrome.gyp:chrome', |
| + '../chrome/chrome.gyp:browser_tests', |
| + ] |
| + }], |
|
sky
2014/10/22 17:24:12
Typically we use an else for this. See line 224 fo
Mr4D (OOO till 08-26)
2014/10/22 23:39:31
Wohow. that "syntax" is easy to miss. Done!
|
| + ['use_athena==0' , { |
| + 'dependencies': [ |
| + '../chrome/chrome.gyp:*', |
| + ] |
| + }], |
| ['OS=="mac" or OS=="ios" or OS=="win"', { |
| 'dependencies': [ |
| '../third_party/nss/nss.gyp:*', |