diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-12 21:14:44 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-12 21:14:44 +0000 |
| commit | 93156cecb487ad7f1d7e307618cd58bd6546da29 (patch) | |
| tree | ab60b7a310d1f8b2abae34e0b7c7703cf4dd2ced /chrome/tools/build | |
| parent | fd5633b12e0ed15c62e6e0001b52bd53b895299c (diff) | |
| download | chromium_src-93156cecb487ad7f1d7e307618cd58bd6546da29.zip chromium_src-93156cecb487ad7f1d7e307618cd58bd6546da29.tar.gz chromium_src-93156cecb487ad7f1d7e307618cd58bd6546da29.tar.bz2 | |
Make the NaCl windows 64 bit binaries not depend on chrome targets. These targets are very simple and used little code from chrome targets. However their dependency on chrome targets was problematic because a lot of code wasn't being built for 64 bit on Windows, and so there were a lot of "dummy" files being added with stub functions and code was also being compiled out in random places for NACL_WIN64.
I've made the NaCl 64 bit windows targets self contained. They do use a few files from common, but those files are self-contained. In the future, we could move these to be in the same 64 bit target as the constants from common. However that won't make a maintenance difference since someone could still introduce link dependencies to other files in common.
Additionally, since we're not using chrome code anymore, we can avoid having both nacl.exe and nacl.dll. nacl.exe is sufficient, and this saves 1.4MB of uncompresed binaries in the installer.
BUG=86322
Review URL: http://codereview.chromium.org/7863024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100767 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools/build')
| -rw-r--r-- | chrome/tools/build/win/FILES | 1 | ||||
| -rw-r--r-- | chrome/tools/build/win/FILES.cfg | 5 | ||||
| -rw-r--r-- | chrome/tools/build/win/SYMBOLS | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/chrome/tools/build/win/FILES b/chrome/tools/build/win/FILES index 338415b..d133c9e 100644 --- a/chrome/tools/build/win/FILES +++ b/chrome/tools/build/win/FILES @@ -4,7 +4,6 @@ avutil-51.dll chrome.exe nacl64.exe chrome.dll -nacl64.dll crash_service.exe crash_service64.exe First Run diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg index 096d2c6..ce99eae 100644 --- a/chrome/tools/build/win/FILES.cfg +++ b/chrome/tools/build/win/FILES.cfg @@ -46,11 +46,6 @@ FILES = [ 'buildtype': ['dev', 'official'], }, { - 'filename': 'nacl64.dll', - 'arch': ['32bit', '64bit'], - 'buildtype': ['dev', 'official'], - }, - { 'filename': 'crash_service.exe', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], diff --git a/chrome/tools/build/win/SYMBOLS b/chrome/tools/build/win/SYMBOLS index f599797..2f53567 100644 --- a/chrome/tools/build/win/SYMBOLS +++ b/chrome/tools/build/win/SYMBOLS @@ -3,7 +3,6 @@ chrome_exe.pdb libEGL.pdb libGLESv2.pdb mini_installer.pdb -nacl64_dll.pdb nacl64_exe.pdb ppGoogleNaClPluginChrome.pdb setup.pdb |