diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-18 18:55:53 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-18 18:55:53 +0000 |
| commit | a02d5276098c7964ec31a6f5db6663013f702a13 (patch) | |
| tree | 2083a0101011215ef72559baa3c96b3fa44e71b5 | |
| parent | e119b80b91009a120b1e98eb9afdfb163a132ffc (diff) | |
| download | chromium_src-a02d5276098c7964ec31a6f5db6663013f702a13.zip chromium_src-a02d5276098c7964ec31a6f5db6663013f702a13.tar.gz chromium_src-a02d5276098c7964ec31a6f5db6663013f702a13.tar.bz2 | |
Make installer build on Win64
This is the first part, and just unbreaks the beginning of the build.
R=gab@chromium.org, brettw@chromium.org
TBR=brettw@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12283031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183135 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/chrome_installer.gypi | 4 | ||||
| -rw-r--r-- | chrome/installer/mini_installer.gyp | 6 | ||||
| -rw-r--r-- | chrome/installer/mini_installer.gypi | 6 |
3 files changed, 16 insertions, 0 deletions
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index c894954..65a5860 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -44,6 +44,8 @@ 'installer/gcapi/gcapi_reactivation.cc', 'installer/gcapi/gcapi_reactivation.h', ], + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + 'msvs_disabled_warnings': [ 4267, ], }, { 'target_name': 'gcapi_test', @@ -460,6 +462,8 @@ 'msvs_cygwin_shell': 1, }, ], + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + 'msvs_disabled_warnings': [ 4267, ], }, ], }], diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp index a01ffe8..e8a1cde 100644 --- a/chrome/installer/mini_installer.gyp +++ b/chrome/installer/mini_installer.gyp @@ -227,6 +227,12 @@ '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', ], }], + ['target_arch=="x64"', { + 'inputs!': [ + '<(PRODUCT_DIR)/nacl64.exe', + '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', + ], + }], ], 'inputs': [ '<(create_installer_archive_py_path)', diff --git a/chrome/installer/mini_installer.gypi b/chrome/installer/mini_installer.gypi index 9bba3ae..a994740 100644 --- a/chrome/installer/mini_installer.gypi +++ b/chrome/installer/mini_installer.gypi @@ -176,6 +176,12 @@ 'enable_touch_ui_flag': '', }, }], + ['target_arch=="x64"', { + 'inputs!': [ + '<(PRODUCT_DIR)/nacl64.exe', + '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', + ], + }], ], 'inputs': [ '<(create_installer_archive_py_path)', |