diff options
| author | dewittj@chromium.org <dewittj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 00:43:11 +0000 |
|---|---|---|
| committer | dewittj@chromium.org <dewittj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 00:43:11 +0000 |
| commit | 11d7f960684686a2cd7f3422c8133c97672cb818 (patch) | |
| tree | 104866ed154563403c740a15d8e65f51d0138bba /chrome/chrome_exe.gypi | |
| parent | 0a999393b6ff0b45e70ad14e3c3e637da5ec8119 (diff) | |
| download | chromium_src-11d7f960684686a2cd7f3422c8133c97672cb818.zip chromium_src-11d7f960684686a2cd7f3422c8133c97672cb818.tar.gz chromium_src-11d7f960684686a2cd7f3422c8133c97672cb818.tar.bz2 | |
Revert 198834 "Add chrome_split_dll gyp variable, and duplicate ..."
> Add chrome_split_dll gyp variable, and duplicate chrome_main_dll target
>
> Currently contains chrome_browser_dll target. Removes some paths from browser->webcore
> via content that are there due to single process mode, and removes dependency of content
> on content_renderer.
>
> Current remaining paths from chrome_browser_dll to webcore: http://i.imgur.com/7WWRvpA.jpg
>
> R=cpu@chromium.org
> BUG=237249
>
> Review URL: https://chromiumcodereview.appspot.com/14682014
TBR=scottmg@chromium.org
Review URL: https://codereview.chromium.org/14882004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198837 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_exe.gypi')
| -rw-r--r-- | chrome/chrome_exe.gypi | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index ef1a01b..247b4bc 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -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', |