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

Unified Diff: chrome/chrome_exe.gypi

Issue 21453003: Fix content_browsertests and other full stack tests in multiple_dll (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 4 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_tests_unit.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 75adb4e7f9466dfd82b511be810d7bbd55660fc1..1b3ef30684a820614ff8ebf91c9833a365bd6aed 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -148,6 +148,7 @@
# Chromium functionality directly into the executable.
'<@(chromium_browser_dependencies)',
'<@(chromium_child_dependencies)',
+ '../content/content.gyp:content_app_both',
# Needed for chrome_main.cc initialization of libraries.
'../build/linux/system.gyp:gtk',
# Needed to use the master_preferences functions
@@ -159,6 +160,7 @@
# Chromium functionality directly into the executable.
'<@(chromium_browser_dependencies)',
'<@(chromium_child_dependencies)',
+ '../content/content.gyp:content_app_both',
# Needed for chrome_main.cc initialization of libraries.
'../build/linux/system.gyp:x11',
'../build/linux/system.gyp:pangocairo',
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698