ucontext_t support for Android x86.

sandbox/linux/seccomp-bpf/sandbox_bpf.cc

 // 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.
 
 #include <signal.h>
 #include <sys/prctl.h>
 #include <sys/syscall.h>
 
 #ifndef SECCOMP_BPF_STANDALONE
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 #endif
 
 #include "sandbox/linux/seccomp-bpf/codegen.h"
 #include "sandbox/linux/seccomp-bpf/sandbox_bpf.h"
 #include "sandbox/linux/seccomp-bpf/syscall.h"
 #include "sandbox/linux/seccomp-bpf/syscall_iterator.h"
 #include "sandbox/linux/seccomp-bpf/verifier.h"
 
 // Android's signal.h doesn't define ucontext etc.
-#if defined(OS_ANDROID) && defined(__arm__)
+#if defined(OS_ANDROID)
+#if defined(__arm__)
 #include "sandbox/linux/services/android_arm_ucontext.h"
+#elif defined(__i386__)

[Markus (顧孟勤), 2012/12/21 02:03:54]

Since you picked a file name that was independent of the flavor of the
architecture, you should probably include this file both for __i386__ and for
__x86_64__

Of course, you should also make sure that the file behaves correctly for these
platforms ... or, if you cannot test that, cause it to trigger an #error if the
flavor is currently unsupported. That would give people a heads-up where they
need to start fixing things, when they want to support additional platform
configurations.

[yfw.chromium, 2012/12/21 07:23:17]

Android just has i386 ABI support now. So we don't need to take care of x86_64
for Android. I will introduce #error for other platform.

And yes. x86_64 may be supported by Android in the future. But I suppose Android
bionic should have ucontext definition for x86_64 at that time. So we could
remove all these local definition and use bionic

+#include "sandbox/linux/services/android_x86_ucontext.h"
+#endif
+
 #endif
 
 namespace {
 
 void WriteFailedStderrSetupMessage(int out_fd) {
   const char* error_string = strerror(errno);
   static const char msg[] = "You have reproduced a puzzling issue.\n"
                             "Please, report to crbug.com/152530!\n"
                             "Failed to set up stderr: ";
   if (HANDLE_EINTR(write(out_fd, msg, sizeof(msg)-1)) > 0 && error_string &&
@@ skipping 950 matching lines @@
 int Sandbox::proc_fd_                   = -1;
 Sandbox::Evaluators Sandbox::evaluators_;
 Sandbox::Traps *Sandbox::traps_         = NULL;
 Sandbox::TrapIds Sandbox::trap_ids_;
 ErrorCode *Sandbox::trap_array_         = NULL;
 size_t Sandbox::trap_array_size_        = 0;
   bool Sandbox::has_unsafe_traps_       = false;
 Sandbox::Conds Sandbox::conds_;
 
 }  // namespace