diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-13 04:00:11 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-13 04:00:11 +0000 |
| commit | 340eab6c6cf8009fdad6275d44ca06eeedea7565 (patch) | |
| tree | 6282b1915dc758e960a3ea606029c67052b02714 | |
| parent | 9459a99c6e59c2ce248985fce66f2d4712bb22a0 (diff) | |
| download | chromium_src-340eab6c6cf8009fdad6275d44ca06eeedea7565.zip chromium_src-340eab6c6cf8009fdad6275d44ca06eeedea7565.tar.gz chromium_src-340eab6c6cf8009fdad6275d44ca06eeedea7565.tar.bz2 | |
Don't try to copy ppGoogleNaClPluginChrome.plugin if disable_nacl==1.
BUG=none
TEST=./build/gyp_chromium -Ddisable_nacl=1 && xcodebuild succeed
Review URL: http://codereview.chromium.org/6840004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81362 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/chrome_dll.gypi | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 0094e81..91ab872 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -444,11 +444,9 @@ }, { 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins', - 'files': [ - '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.plugin', - ], + 'files': [], 'conditions': [ - [ 'branding == "Chrome"', { + ['branding == "Chrome"', { 'files': [ '<(PRODUCT_DIR)/Flash Player Plugin for Chrome.plugin', '<(PRODUCT_DIR)/plugin.vch', @@ -459,6 +457,11 @@ '<(PRODUCT_DIR)/PDF.plugin', ], }], + ['disable_nacl!=1', { + 'files': [ + '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.plugin', + ], + }], ], }, { |