diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-06 02:51:15 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-06 02:51:15 +0000 |
| commit | c955a8d2084220f245f6ef5e78baef677691b23a (patch) | |
| tree | da95605b9c91145bfd149d6039e99daa4954405a /chrome/chrome_exe.gypi | |
| parent | ed4d58055596873743318eaa713560dec2418573 (diff) | |
| download | chromium_src-c955a8d2084220f245f6ef5e78baef677691b23a.zip chromium_src-c955a8d2084220f245f6ef5e78baef677691b23a.tar.gz chromium_src-c955a8d2084220f245f6ef5e78baef677691b23a.tar.bz2 | |
Fix content_browsertests and other full stack tests in multiple_dll
Tests need both sets of entry point functions, ContentClient embedder
pointers, etc. Now in gyp, the three targets are content_app_browser for
browser-only, content_app_child, which is child-only, and
content_app_both which contains both.
TBR=joth@chromium.org, grt@chromium.org
R=jam@chromium.org
BUG=237249
Review URL: https://chromiumcodereview.appspot.com/21453003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215771 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_exe.gypi')
| -rw-r--r-- | chrome/chrome_exe.gypi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 75adb4e..1b3ef306 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', |