diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 21:54:58 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 21:54:58 +0000 |
| commit | 1c3bcc633c51a1c509ab092bb1ce5d1762b927f3 (patch) | |
| tree | 6c5d475ceff84af90acaaec9295c4d7788d94687 /chrome/chrome_exe.gypi | |
| parent | 5fcfe81a21e65a21a8066e1e5ce3a1e19df9a1c9 (diff) | |
| download | chromium_src-1c3bcc633c51a1c509ab092bb1ce5d1762b927f3.zip chromium_src-1c3bcc633c51a1c509ab092bb1ce5d1762b927f3.tar.gz chromium_src-1c3bcc633c51a1c509ab092bb1ce5d1762b927f3.tar.bz2 | |
fix chrome_split_dll when use_aura=1
chrome.exe was linking in both app/chrome_exe_main_aura.cc and
app/chrome_exe_main_win.cc on Aura. We only want _win. This breaks
chrome_split_dll because of some magic linker behaviour related to main() when
doing split link.
R=cpu@chromium.org
Review URL: https://chromiumcodereview.appspot.com/16848014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206500 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_exe.gypi')
| -rw-r--r-- | chrome/chrome_exe.gypi | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 42537ec..9479b02 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -64,6 +64,12 @@ }], ] }], + ['OS == "win" and use_aura==1', { + 'sources!': [ + # We still want the _win entry point for sandbox, etc. + 'app/chrome_exe_main_aura.cc', + ], + }], ['OS == "android"', { # Don't put the 'chrome' target in 'all' on android 'suppress_wildcard': 1, |