summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-20 03:20:29 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-20 03:20:29 +0000
commitc84bf01c4381f913206ee9e4fc515ecbd4a6ad71 (patch)
tree29a5618d0dc5595f7172d05ccf72389acc820822
parentd8f8906ed053be65a988029eda4e40d310bde0e6 (diff)
downloadchromium_src-c84bf01c4381f913206ee9e4fc515ecbd4a6ad71.zip
chromium_src-c84bf01c4381f913206ee9e4fc515ecbd4a6ad71.tar.gz
chromium_src-c84bf01c4381f913206ee9e4fc515ecbd4a6ad71.tar.bz2
Do not compile browser/extensions/extension_nacl_browsertest.cc
iff disable_nacl==1 BUG=97184 Review URL: http://codereview.chromium.org/7969008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101908 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/chrome_tests.gypi5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 62a49e7..55f79c2 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2480,6 +2480,11 @@
'browser/ui/webui/print_preview.js',
],
}],
+ ['disable_nacl==1', {
+ 'sources!': [
+ 'browser/extensions/extension_nacl_browsertest.cc',
+ ],
+ }],
['touchui==1', {
'sources': [
'browser/ui/touch/keyboard/keyboard_manager_browsertest.cc',