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

Unified Diff: chrome/chrome.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 | « build/gyp_chromium ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 87b89490079a4b14e149d1d9e3fce61f3c50f794..7ea36017dcd8cc94d3af2aa3ecf13e7817aae69f 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -37,7 +37,7 @@
'nacl_win64_dependencies': [
'common_nacl_win64',
'common_constants_win64',
- 'installer/installer.gyp:installer_util_nacl_win64',
+ 'installer_util_nacl_win64',
],
'allocator_target': '../base/allocator/allocator.gyp:allocator',
'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
@@ -124,6 +124,8 @@
'chrome_common.gypi',
'chrome_dll.gypi',
'chrome_exe.gypi',
+ 'chrome_installer.gypi',
+ 'chrome_installer_util.gypi',
'chrome_renderer.gypi',
'chrome_tests.gypi',
'common_constants.gypi',
@@ -225,7 +227,7 @@
# will always get built before installer_util.
'type': 'dummy_executable',
'dependencies': ['../build/win/system.gyp:cygwin',
- 'installer/installer.gyp:installer_util_strings',],
+ 'installer_util_strings',],
}, {
'type': 'none',
}],
@@ -1361,7 +1363,6 @@
'type': 'none',
'dependencies': [
'installer/mini_installer.gyp:*',
- 'installer/installer.gyp:*',
'../app/app.gyp:*',
'../base/base.gyp:*',
'../chrome_frame/chrome_frame.gyp:*',
@@ -1551,7 +1552,7 @@
'msvs_guid': '89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC',
'dependencies': [
'common_constants',
- 'installer/installer.gyp:installer_util',
+ 'installer_util',
'../base/base.gyp:base',
'../breakpad/breakpad.gyp:breakpad_handler',
'../breakpad/breakpad.gyp:breakpad_sender',
« no previous file with comments | « build/gyp_chromium ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698