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/nacl.gypi | |
| 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/nacl.gypi')
| -rw-r--r-- | chrome/nacl.gypi | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index d8591b0..86a5467 100644 --- a/chrome/nacl.gypi +++ b/chrome/nacl.gypi @@ -66,9 +66,6 @@ 'python build_nacl_irt.py --inputs', }, 'dependencies': [ - # TODO(gregoryd): chrome_resources and chrome_strings could be - # shared with the 64-bit target, but it does not work due to a gyp - #issue 'chrome_resources', 'chrome_strings', 'common', @@ -149,18 +146,17 @@ 'nacl_target': 1, }, 'dependencies': [ - # TODO(gregoryd): chrome_resources and chrome_strings could be - # shared with the 32-bit target, but it does not work due to a gyp - #issue - 'chrome_resources', - 'chrome_strings', - 'common_nacl_win64', '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel64', '../native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib64', ], 'sources': [ - 'nacl/broker_thread.cc', - 'nacl/broker_thread.h', + 'common/nacl_cmd_line.cc', + 'common/nacl_messages.cc', + 'nacl/nacl_broker_listener.cc', + 'nacl/nacl_broker_listener.h', + ], + 'include_dirs': [ + '..', ], 'defines': [ '<@(nacl_win64_defines)', |