Linux sandbox: modify GYP files to compile under Android.

sandbox/linux/seccomp-bpf/sandbox_bpf.h

 // 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.
 
 #ifndef SANDBOX_LINUX_SECCOMP_BPF_SANDBOX_BPF_H__
 #define SANDBOX_LINUX_SECCOMP_BPF_SANDBOX_BPF_H__
 
 #include <endian.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <linux/audit.h>
+//#include <linux/audit.h>

[Markus (顧孟勤), 2012/12/18 23:20:48]

Probably insert a space so it looks the same as for <linux/seccomp.h>

[jln (very slow on Chromium), 2012/12/18 23:24:55]

Done.

 #include <linux/filter.h>
 // #include <linux/seccomp.h>
 #include <linux/unistd.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <netinet/udp.h>
 #include <sched.h>
 #include <signal.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/ipc.h>
 #include <sys/mman.h>
 #include <sys/prctl.h>
-#include <sys/shm.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <sys/wait.h>
 #include <time.h>
 #include <unistd.h>
 
 #include <algorithm>
 #include <limits>
 #include <map>
@@ skipping 11 matching lines @@
 #if !defined(SECCOMP_BPF_STANDALONE)
 #include "base/third_party/valgrind/valgrind.h"
 #endif
 #endif
 
 
 // The Seccomp2 kernel ABI is not part of older versions of glibc.
 // As we can't break compilation with these versions of the library,
 // we explicitly define all missing symbols.
 
+// For audit.h

[Markus (顧孟勤), 2012/12/18 23:20:48]

This is all generally fine, and I don't have a problem with adding definitions
that are missing in our toolchain.

But it would be nice if we could reformat things a little bit to try to align
the defined values vertically. We already do this a little bit with the existing
definitions in this file.

You probably won't be able to do this perfectly, but a best effort would already
make things a little more readable.

[jln (very slow on Chromium), 2012/12/18 23:24:55]

Done.

+#ifndef EM_ARM
+#define EM_ARM 40
+#endif
+#ifndef EM_386
+#define EM_386 3
+#endif
+#ifndef EM_X86_64
+#define EM_X86_64 62
+#endif
+
+#ifndef __AUDIT_ARCH_64BIT
+#define __AUDIT_ARCH_64BIT 0x80000000
+#endif
+#ifndef __AUDIT_ARCH_LE
+#define __AUDIT_ARCH_LE    0x40000000
+#endif
+#ifndef AUDIT_ARCH_ARM
+#define AUDIT_ARCH_ARM    (EM_ARM|__AUDIT_ARCH_LE)
+#endif
+#ifndef AUDIT_ARCH_I386
+#define AUDIT_ARCH_I386 (EM_386|__AUDIT_ARCH_LE)
+#endif
+#ifndef AUDIT_ARCH_X86_64
+#define AUDIT_ARCH_X86_64 (EM_X86_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
+#endif
+
+// For prctl.h
 #ifndef PR_SET_NO_NEW_PRIVS
 #define PR_SET_NO_NEW_PRIVS          38
 #define PR_GET_NO_NEW_PRIVS          39
 #endif
 #ifndef IPC_64
 #define IPC_64                   0x0100
 #endif
 
 // In order to build will older tool chains, we currently have to avoid
 // including <linux/seccomp.h>. Until that can be fixed (if ever). Rely on
@@ skipping 87 matching lines @@
 // ARM EABI includes "ARM private" system calls starting at |__ARM_NR_BASE|,
 // and a "ghost syscall private to the kernel", cmpxchg,
 // at |__ARM_NR_BASE+0x00fff0|.
 // See </arch/arm/include/asm/unistd.h> in the Linux kernel.
 #define MIN_SYSCALL         ((unsigned int)__NR_SYSCALL_BASE)
 #define MAX_PUBLIC_SYSCALL  (MIN_SYSCALL + 1024u)
 #define MIN_PRIVATE_SYSCALL ((unsigned int)__ARM_NR_BASE)
 #define MAX_PRIVATE_SYSCALL (MIN_PRIVATE_SYSCALL + 16u)
 #define MIN_GHOST_SYSCALL   ((unsigned int)__ARM_NR_BASE + 0xfff0u)
 #define MAX_SYSCALL         (MIN_GHOST_SYSCALL + 4u)
-// <linux/audit.h> includes <linux/elf-em.h>, which does not define EM_ARM.
-// <linux/elf.h> only includes <asm/elf.h> if we're in the kernel.
-# if !defined(EM_ARM)
-# define EM_ARM 40
-# endif
+
 #define SECCOMP_ARCH AUDIT_ARCH_ARM
 
 // ARM sigcontext_t is different from i386/x86_64.
 // See </arch/arm/include/asm/sigcontext.h> in the Linux kernel.
 #define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.arm_##_reg)
 // ARM EABI syscall convention.
 #define SECCOMP_RESULT(_ctx)    SECCOMP_REG(_ctx, r0)
 #define SECCOMP_SYSCALL(_ctx)   SECCOMP_REG(_ctx, r7)
 #define SECCOMP_IP(_ctx)        SECCOMP_REG(_ctx, pc)
 #define SECCOMP_PARM1(_ctx)     SECCOMP_REG(_ctx, r0)
@@ skipping 271 matching lines @@
   static size_t        trap_array_size_;
   static bool          has_unsafe_traps_;
   static Conds         conds_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(Sandbox);
 };
 
 }  // namespace
 
 #endif  // SANDBOX_LINUX_SECCOMP_BPF_SANDBOX_BPF_H__