commit eee3155a563aa34d1dc58a625bdc59a577271adb
author Lei Zhang <thestig@chromium.org> Wed Oct 17 21:27:10 2012 -0700
committer Gerrit <chrome-bot@google.com> Fri Oct 19 17:48:28 2012 -0700
tree e1678cf15f4d11ff611aa71af08d13b771c650ad
parent 6537a568125667e8db44a0af38fd04fc8fd07ef7

Make it easier to build libminijail on Chromium Linux.

- Move libsyscalls.gen.c generation code out of the Makefile and into a
  script.
- Add SECURE_ALL_* defines for systems that do not linux/securebits.h.

BUG=chromium-os:35482
TEST=FEATURES=test emerge chromeos-minijail

Change-Id: I922c579f1fcf09db2379659dbde737f246200e51
Reviewed-on: https://gerrit.chromium.org/gerrit/35928
Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Lei Zhang <thestig@chromium.org>
Tested-by: Lei Zhang <thestig@chromium.org>

libminijail.c

diff --git a/libminijail.c b/libminijail.c
index a0bfb7f..813dce7 100644
--- a/libminijail.c
+++ b/libminijail.c
@@ -14,7 +14,6 @@
 #include <inttypes.h>
 #include <limits.h>
 #include <linux/capability.h>
-#include <linux/securebits.h>
 #include <pwd.h>
 #include <sched.h>
 #include <signal.h>
@@ -39,6 +38,13 @@
 #include "syscall_filter.h"
 #include "util.h"
 
+#ifdef HAVE_SECUREBITS_H
+#include <linux/securebits.h>
+#else
+#define SECURE_ALL_BITS         0x15
+#define SECURE_ALL_LOCKS        (SECURE_ALL_BITS << 1)
+#endif
+
 /* Until these are reliably available in linux/prctl.h */
 #ifndef PR_SET_SECCOMP
 # define PR_SET_SECCOMP 22