Bug 1162846 - Don't use str.find in moz.build. r=mshal

ipc/chromium/moz.build

@@ -251,7 +251,7 @@ if os_bsd:
         LOCAL_INCLUDES += ['src/third_party/libevent/bsd']
 
 ost = CONFIG['OS_TEST']
-if ost.find('86') == -1 and ost.find('arm') == -1 and ost.find('mips') == -1:
+if '86' not in ost and 'arm' not in ost and 'mips' not in ost:
     SOURCES += [
         'src/base/atomicops_internals_mutex.cc',
     ]

xpcom/reflect/xptcall/md/unix/moz.build

@@ -33,14 +33,14 @@ if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD', 'NetBSD', 'OpenBSD') or \
             'xptcinvoke_x86_64_unix.cpp',
             'xptcstubs_x86_64_linux.cpp',
         ]
-    elif CONFIG['OS_TEST'].find('86') != -1:
+    elif '86' in CONFIG['OS_TEST']:
         SOURCES += [
             'xptcinvoke_gcc_x86_unix.cpp',
             'xptcstubs_gcc_x86_unix.cpp'
         ]
 
 if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD'):
-    if CONFIG['OS_TEST'].find('ia64') != -1:
+    if 'ia64' in CONFIG['OS_TEST']:
         SOURCES += [
             'xptcinvoke_asm_ipf64.s',
             'xptcinvoke_ipf64.cpp',
@@ -48,7 +48,7 @@ if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD'):
             'xptcstubs_ipf64.cpp'
         ]
 
-if CONFIG['OS_ARCH'] == 'SunOS':
+if CONFIG['OS_ARCH'] == 'SunOS' and '86' in CONFIG['OS_TEST']:
     if CONFIG['OS_TEST'] == 'x86_64':
         if CONFIG['GNU_CC']:
             SOURCES += [
@@ -61,7 +61,7 @@ if CONFIG['OS_ARCH'] == 'SunOS':
                 'xptcstubs_asm_x86_64_solaris_SUNW.s',
                 'xptcstubs_x86_64_solaris.cpp',
             ]
-    elif CONFIG['OS_TEST'].find('86') != -1:
+    else:
         if CONFIG['GNU_CC']:
             SOURCES += [
                 'xptcinvoke_gcc_x86_unix.cpp',
@@ -156,8 +156,8 @@ if CONFIG['OS_ARCH'] == 'Linux':
             'xptcinvoke_linux_m68k.cpp',
             'xptcstubs_linux_m68k.cpp',
         ]
-    if CONFIG['OS_TEST'].find('mips') != -1:
-        if CONFIG['OS_TEST'].find('mips64') != -1:
+    if 'mips' in CONFIG['OS_TEST']:
+        if 'mips64' in CONFIG['OS_TEST']:
             SOURCES += [
                 'xptcinvoke_asm_mips64.S',
                 'xptcinvoke_mips64.cpp',
@@ -234,7 +234,7 @@ if CONFIG['OS_ARCH'] == 'OpenBSD' and CONFIG['OS_TEST'] == 'powerpc':
         'xptcstubs_ppc_openbsd.cpp',
     ]
 
-if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TEST'].find('sparc') != -1:
+if CONFIG['OS_ARCH'] == 'Linux' and 'sparc' in CONFIG['OS_TEST']:
     SOURCES += [
         'xptcinvoke_asm_sparc_linux_GCC3.s',
         'xptcinvoke_sparc_solaris.cpp',
@@ -266,7 +266,7 @@ if CONFIG['OS_ARCH'] in ('OpenBSD', 'FreeBSD') and CONFIG['OS_TEST'] == 'sparc64
         'xptcstubs_sparc64_openbsd.cpp',
     ]
 
-if CONFIG['OS_ARCH'] == 'SunOS' and CONFIG['OS_TEST'].find('86') == -1:
+if CONFIG['OS_ARCH'] == 'SunOS' and '86' not in CONFIG['OS_TEST']:
     GENERATED_FILES = [
         'xptcstubsdef_asm.solx86',
     ]