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

Unified Diff: build/all.gyp

Issue 2067018: Break gyp cycles on Linux. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: remove duplicate vars Created 10 years, 7 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 | build/gyp_chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
diff --git a/build/all.gyp b/build/all.gyp
index 8e7c5de6e6a2ac3949fac7b5e159a748c13f21d1..2cee81391812d1de9335ce12e049d88c65ae62c0 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -72,7 +72,7 @@
'conditions': [
['branding=="Chrome"', {
'dependencies': [
- '../chrome/installer/installer.gyp:linux_packages_<(channel)',
+ '../chrome/chrome.gyp:linux_packages_<(channel)',
],
}],
],
@@ -211,8 +211,10 @@
'dependencies': [
'../app/app.gyp:app_unittests',
'../chrome/chrome.gyp:browser_tests',
+ '../chrome/chrome.gyp:installer_util_unittests',
'../chrome/chrome.gyp:interactive_ui_tests',
'../chrome/chrome.gyp:memory_test',
+ '../chrome/chrome.gyp:mini_installer_test',
'../chrome/chrome.gyp:nacl_ui_tests',
'../chrome/chrome.gyp:notifier_unit_tests',
'../chrome/chrome.gyp:page_cycler_tests',
@@ -224,8 +226,6 @@
'../chrome/chrome.gyp:ui_tests',
'../chrome/chrome.gyp:unit_tests',
'../chrome/chrome.gyp:url_fetch_test',
- '../chrome/installer/installer.gyp:installer_util_unittests',
- '../chrome/installer/installer.gyp:mini_installer_test',
# mini_installer_tests depends on mini_installer. This should be
# defined in installer.gyp.
'../chrome/installer/mini_installer.gyp:mini_installer',
« no previous file with comments | « no previous file | build/gyp_chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698