This change sanitizes the x86-specific platform headers and libraries. It does two things: - Remove the stuff under android-3/arch-x86 - Update the content of android-9/arch-x86 from a recent AOSP full_x86-eng build (see caveats below). Some files appear to move because they didn't change (e.g. kernel headers). This change was generated by following these steps: 1/ Build full_x86-eng from the AOSP tree 2/ From $ANDROID_ROOT/ndk, run: build/tools/dev-system-import.sh --direct --arch=x86 9 3/ Under $ANDROID_ROOT/development/ndk, do: git rm -r android-3/arch-x86 git add android-9/arch-x86 git checkout -- android-9/include git ls-files -o | xargs rm git commit IMPORTANT: The AOSP tip-of-tree used to generate these files includes post-Gingerbread changes !! The final version of the android-9/arch-x86 files will have to be generated from the gingerbread branch after we back-port all x86-support changes to it. These binaries are thus not final, but can be used to generate working experimental NDK packages, including prebuilt GNU libstdc++ and STLport binaries that implement -fstack-protector correctly. Change-Id: I260896185a098b9b356bd26f492692e4a4f66f8f
39 lines
1.2 KiB
C
39 lines
1.2 KiB
C
/****************************************************************************
|
|
****************************************************************************
|
|
***
|
|
*** This header was automatically generated from a Linux kernel header
|
|
*** of the same name, to make information necessary for userspace to
|
|
*** call into the kernel available to libc. It contains only constants,
|
|
*** structures, and macros generated from the original header, and thus,
|
|
*** contains no copyrightable information.
|
|
***
|
|
****************************************************************************
|
|
****************************************************************************/
|
|
#ifndef _ASM_X86_MSGBUF_H
|
|
#define _ASM_X86_MSGBUF_H
|
|
|
|
struct msqid64_ds {
|
|
struct ipc64_perm msg_perm;
|
|
__kernel_time_t msg_stime;
|
|
#ifdef __i386__
|
|
unsigned long __unused1;
|
|
#endif
|
|
__kernel_time_t msg_rtime;
|
|
#ifdef __i386__
|
|
unsigned long __unused2;
|
|
#endif
|
|
__kernel_time_t msg_ctime;
|
|
#ifdef __i386__
|
|
unsigned long __unused3;
|
|
#endif
|
|
unsigned long msg_cbytes;
|
|
unsigned long msg_qnum;
|
|
unsigned long msg_qbytes;
|
|
__kernel_pid_t msg_lspid;
|
|
__kernel_pid_t msg_lrpid;
|
|
unsigned long __unused4;
|
|
unsigned long __unused5;
|
|
};
|
|
|
|
#endif
|