diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-26 21:06:26 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-26 21:06:26 +0000 |
| commit | 93bb1ce318127932512ccba2776e2e4554633506 (patch) | |
| tree | b36065d2bd433c7b8d7ae9568a27f4936e46b344 /chrome/installer | |
| parent | dccbbb1d1c707faab941be02f0f68ab805d0a7a7 (diff) | |
| download | chromium_src-93bb1ce318127932512ccba2776e2e4554633506.zip chromium_src-93bb1ce318127932512ccba2776e2e4554633506.tar.gz chromium_src-93bb1ce318127932512ccba2776e2e4554633506.tar.bz2 | |
Omit nacl-related targets from mini_installer when disable_nacl==1.
NaCL doesn't build with ninja on account of http://crbug.com/127510. NaCL can be disabled via a GYP define, but the mini_installer hasn't been made aware of this until now.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10535050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144273 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/mini_installer.gyp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp index 94f4457..0748ceb 100644 --- a/chrome/installer/mini_installer.gyp +++ b/chrome/installer/mini_installer.gyp @@ -223,6 +223,14 @@ 'component_build_flag': '', }, }], + ['disable_nacl==1', { + 'inputs!': [ + '<(PRODUCT_DIR)/nacl64.exe', + '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', + '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', + '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', + ], + }], ], 'inputs': [ '<(create_installer_archive_py_path)', |