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

Unified Diff: chrome/chrome_exe.gypi

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 | « chrome/chrome_dll.gypi ('k') | chrome/chrome_installer.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_exe.gypi
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 268e0816a952a432a62e6bcce19765782f9fa088..d2d02e4a1904eb5a77dadbcbf4f8d01d58205f08 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -190,7 +190,7 @@
'../build/linux/system.gyp:gtk',
'packed_resources',
# Needed to use the master_preferences functions
- 'installer/installer.gyp:installer_util',
+ 'installer_util',
],
'sources': [
'app/chrome_dll_main.cc',
@@ -433,7 +433,7 @@
'conditions': [
['branding=="Chrome"', {
'dependencies': [
- 'installer/installer.gyp:linux_installer_configs',
+ 'linux_installer_configs',
],
}],
['selinux==0', {
@@ -473,8 +473,8 @@
}],
['OS=="win"', {
'dependencies': [
- 'installer/installer.gyp:installer_util',
- 'installer/installer.gyp:installer_util_strings',
+ 'installer_util',
+ 'installer_util_strings',
'../breakpad/breakpad.gyp:breakpad_handler',
'../breakpad/breakpad.gyp:breakpad_sender',
'../sandbox/sandbox.gyp:sandbox',
@@ -568,7 +568,7 @@
# which contains all of the library code with Chromium
# functionality.
'chrome_dll_nacl_win64',
- 'installer/installer.gyp:installer_util_nacl_win64',
+ 'installer_util_nacl_win64',
'common_constants_win64',
'../breakpad/breakpad.gyp:breakpad_handler_win64',
'../breakpad/breakpad.gyp:breakpad_sender_win64',
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/chrome_installer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698