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

Unified Diff: trunk/src/chrome/chrome_exe.gypi

Issue 14882004: Revert 198834 "Add chrome_split_dll gyp variable, and duplicate ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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 | « trunk/src/chrome/chrome_dll.gypi ('k') | trunk/src/chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/chrome_exe.gypi
===================================================================
--- trunk/src/chrome/chrome_exe.gypi (revision 198835)
+++ trunk/src/chrome/chrome_exe.gypi (working copy)
@@ -142,8 +142,7 @@
'dependencies': [
# On Linux, link the dependencies (libraries) that make up actual
# Chromium functionality directly into the executable.
- '<@(chromium_browser_dependencies)',
- '<@(chromium_child_dependencies)',
+ '<@(chromium_dependencies)',
# Needed for chrome_main.cc initialization of libraries.
'../build/linux/system.gyp:gtk',
# Needed to use the master_preferences functions
@@ -153,8 +152,7 @@
'dependencies': [
# On Linux, link the dependencies (libraries) that make up actual
# Chromium functionality directly into the executable.
- '<@(chromium_browser_dependencies)',
- '<@(chromium_child_dependencies)',
+ '<@(chromium_dependencies)',
# Needed for chrome_main.cc initialization of libraries.
'../build/linux/system.gyp:x11',
'../build/linux/system.gyp:pangocairo',
« no previous file with comments | « trunk/src/chrome/chrome_dll.gypi ('k') | trunk/src/chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698