3e1498c4c4
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
42 lines
2.0 KiB
C
42 lines
2.0 KiB
C
/* bionic/arch-arm/include/machine/kernel.h
|
|
**
|
|
** Copyright 2006-2008, The Android Open Source Project
|
|
**
|
|
** Redistribution and use in source and binary forms, with or without
|
|
** modification, are permitted provided that the following conditions are met:
|
|
** * Redistributions of source code must retain the above copyright
|
|
** notice, this list of conditions and the following disclaimer.
|
|
** * Redistributions in binary form must reproduce the above copyright
|
|
** notice, this list of conditions and the following disclaimer in the
|
|
** documentation and/or other materials provided with the distribution.
|
|
** * Neither the name of Google Inc. nor the names of its contributors may
|
|
** be used to endorse or promote products derived from this software
|
|
** without specific prior written permission.
|
|
**
|
|
** THIS SOFTWARE IS PROVIDED BY Google Inc. ``AS IS'' AND ANY EXPRESS OR
|
|
** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
** MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
|
** EVENT SHALL Google Inc. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
** PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
** OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
** WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
** OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
** ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
#ifndef _ARCH_X86_KERNEL_H
|
|
#define _ARCH_X86_KERNEL_H
|
|
|
|
/* this file contains kernel-specific definitions that were optimized out of
|
|
our processed kernel headers, but still useful nonetheless... */
|
|
|
|
typedef unsigned long __kernel_blkcnt_t;
|
|
typedef unsigned long __kernel_blksize_t;
|
|
|
|
/* these aren't really defined by the kernel headers though... */
|
|
typedef unsigned long __kernel_fsblkcnt_t;
|
|
typedef unsigned long __kernel_fsfilcnt_t;
|
|
typedef unsigned int __kernel_id_t;
|
|
|
|
#endif /* _ARCH_X86_KERNEL_H */
|