summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-28 14:20:20 +0000
committermkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-28 14:20:20 +0000
commitb62753a029d1c11aa5f94ee278c6291ce2a544af (patch)
tree635a3088b6a3559f6aa0c001b2e02e9888f43d9e
parent55ddb3c59070eb300700d5a2aa56bd2d8f766cdf (diff)
downloadchromium_src-b62753a029d1c11aa5f94ee278c6291ce2a544af.zip
chromium_src-b62753a029d1c11aa5f94ee278c6291ce2a544af.tar.gz
chromium_src-b62753a029d1c11aa5f94ee278c6291ce2a544af.tar.bz2
Fix gyp --checked violations.
This removes 'or' and 'and' usage that is outside of quoted strings. TBR=dmichael@chromium.org BUG= Review URL: https://chromiumcodereview.appspot.com/10886009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153660 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--gpu/gpu.gyp2
-rw-r--r--ppapi/ppapi_internal.gyp2
-rw-r--r--ppapi/ppapi_ipc.gypi2
3 files changed, 3 insertions, 3 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 712f7aa..0b805c1 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -410,7 +410,7 @@
},
],
}],
- ['disable_nacl!=1' and 'OS=="win"', {
+ ['disable_nacl!=1 and OS=="win"', {
'targets': [
{
'target_name': 'gpu_ipc_win64',
diff --git a/ppapi/ppapi_internal.gyp b/ppapi/ppapi_internal.gyp
index 93dc5a0..2049620 100644
--- a/ppapi/ppapi_internal.gyp
+++ b/ppapi/ppapi_internal.gyp
@@ -166,7 +166,7 @@
},
],
}],
- ['disable_nacl!=1' and 'OS=="win"', {
+ ['disable_nacl!=1 and OS=="win"', {
# In windows builds, we also want to define some targets to build in
# 64-bit mode for use by nacl64.exe (the NaCl helper process for 64-bit
# Windows).
diff --git a/ppapi/ppapi_ipc.gypi b/ppapi/ppapi_ipc.gypi
index 926e0e2..8c23bf2 100644
--- a/ppapi/ppapi_ipc.gypi
+++ b/ppapi/ppapi_ipc.gypi
@@ -32,7 +32,7 @@
'..',
],
'target_conditions': [
- ['>(nacl_untrusted_build)==1' or '>(nacl_win64_target)==1', {
+ ['>(nacl_untrusted_build)==1 or >(nacl_win64_target)==1', {
'sources!': [
'proxy/serialized_flash_menu.cc',
],