Android make sandbox/linux/seccomp-bpf compile on i386

sandbox/linux/sandbox_linux.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'conditions': [
       ['OS=="linux"', {
         'compile_suid_client': 1,
       }, {
         'compile_suid_client': 0,
       }],
-      ['((OS=="linux" or (OS=="android" and target_arch=="arm")) and '
+      ['((OS=="linux" or OS=="android") and '
              '(target_arch=="ia32" or target_arch=="x64" or '
               'target_arch=="arm"))', {
         'compile_seccomp_bpf': 1,
       }, {
         'compile_seccomp_bpf': 0,
       }],
     ],
   },
   'target_defaults': {
     'target_conditions': [
@@ skipping 96 matching lines @@
         'seccomp-bpf/sandbox_bpf.h',
         'seccomp-bpf/syscall.cc',
         'seccomp-bpf/syscall.h',
         'seccomp-bpf/syscall_iterator.cc',
         'seccomp-bpf/syscall_iterator.h',
         'seccomp-bpf/verifier.cc',
         'seccomp-bpf/verifier.h',
       ],
       'dependencies': [
         '../base/base.gyp:base',
+        'sandbox_services_headers',
       ],
       'include_dirs': [
         '../..',
       ],
     },
     {
       # The setuid sandbox, for Linux
       'target_name': 'chrome_sandbox',
       'type': 'executable',
       'sources': [
@@ skipping 19 matching lines @@
         'services/broker_process.cc',
         'services/broker_process.h',
       ],
       'dependencies': [
         '../base/base.gyp:base',
       ],
       'include_dirs': [
         '..',
       ],
     },
+    { 'target_name': 'sandbox_services_headers',
+      'type': 'none',
+      'sources': [
+        'services/android_arm_ucontext.h',
+        'services/android_ucontext.h',
+        'services/android_i386_ucontext.h',
+        'services/arm_linux_syscalls.h',
+        'services/linux_syscalls.h',
+        'services/x86_32_linux_syscalls.h',
+        'services/x86_64_linux_syscalls.h',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+    },
     {
       # We make this its own target so that it does not interfere
       # with our tests.
       'target_name': 'libc_urandom_override',
       'type': 'static_library',
       'sources': [
         'services/libc_urandom_override.cc',
         'services/libc_urandom_override.h',
       ],
       'dependencies': [
@@ skipping 36 matching lines @@
           'input_shlib_path':
               '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)sandbox_linux_unittests'
               '<(SHARED_LIB_SUFFIX)',
         },
         'includes': [ '../../build/apk_test.gypi' ],
         }
       ],
     }],
   ],
 }