diff options
author | Andrew Hsieh <andrewhsieh@google.com> | 2012-12-21 09:07:04 +0800 |
---|---|---|
committer | Andrew Hsieh <andrewhsieh@google.com> | 2012-12-21 14:18:01 +0800 |
commit | 3123853ede6209e485fb7110bdcd38aea0f33d23 (patch) | |
tree | d660e60ac5f03d4dfc987199f531f8eac6ddccb5 /8/platforms/android-9/arch-arm | |
parent | 3d1b492606ffe30bd28f869546d88c4f19c933ed (diff) | |
download | prebuilts_ndk-3123853ede6209e485fb7110bdcd38aea0f33d23.zip prebuilts_ndk-3123853ede6209e485fb7110bdcd38aea0f33d23.tar.gz prebuilts_ndk-3123853ede6209e485fb7110bdcd38aea0f33d23.tar.bz2 |
Update prebuilts/ndk/8 to r8d/r8c
1. Update prebuilts/ndk/8 to r8d release (*1), except for
2. sources/cxx-stl/gabi++ and sources/cxx-stl/stlport remain
in r8c before exception handling support is added for r8d.
Both will be upgraded to r8d once abi/ is upgraded to r8d's
gabi++.
3. Add link 8/platforms/android-*
(*1) http://developer.android.com/tools/sdk/ndk/index.html
Change-Id: If61526b0f815a0f980ab19ffd10765a3b69ceb28
Diffstat (limited to '8/platforms/android-9/arch-arm')
26 files changed, 147 insertions, 40 deletions
diff --git a/8/platforms/android-9/arch-arm/usr/include/GLES2/gl2.h b/8/platforms/android-9/arch-arm/usr/include/GLES2/gl2.h index e1d3b87..c139c25 100644 --- a/8/platforms/android-9/arch-arm/usr/include/GLES2/gl2.h +++ b/8/platforms/android-9/arch-arm/usr/include/GLES2/gl2.h @@ -528,7 +528,7 @@ GL_APICALL void GL_APIENTRY glGenTextures (GLsizei n, GLuint* textures); GL_APICALL void GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name); GL_APICALL void GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name); GL_APICALL void GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders); -GL_APICALL int GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name); +GL_APICALL GLint GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name); GL_APICALL void GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean* params); GL_APICALL void GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params); GL_APICALL GLenum GL_APIENTRY glGetError (void); @@ -547,7 +547,7 @@ GL_APICALL void GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum p GL_APICALL void GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint* params); GL_APICALL void GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat* params); GL_APICALL void GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint* params); -GL_APICALL int GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name); +GL_APICALL GLint GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name); GL_APICALL void GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat* params); GL_APICALL void GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint* params); GL_APICALL void GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid** pointer); diff --git a/8/platforms/android-9/arch-arm/usr/include/android/bitmap.h b/8/platforms/android-9/arch-arm/usr/include/android/bitmap.h index 160e34a..fabb7f4 100644 --- a/8/platforms/android-9/arch-arm/usr/include/android/bitmap.h +++ b/8/platforms/android-9/arch-arm/usr/include/android/bitmap.h @@ -23,11 +23,14 @@ __BEGIN_DECLS -#define ANDROID_BITMAP_RESUT_SUCCESS 0 +#define ANDROID_BITMAP_RESULT_SUCCESS 0 #define ANDROID_BITMAP_RESULT_BAD_PARAMETER -1 #define ANDROID_BITMAP_RESULT_JNI_EXCEPTION -2 #define ANDROID_BITMAP_RESULT_ALLOCATION_FAILED -3 +/* Backward compatibility: this macro used to be misspelled. */ +#define ANDROID_BITMAP_RESUT_SUCCESS ANDROID_BITMAP_RESULT_SUCCESS + enum AndroidBitmapFormat { ANDROID_BITMAP_FORMAT_NONE = 0, ANDROID_BITMAP_FORMAT_RGBA_8888 = 1, diff --git a/8/platforms/android-9/arch-arm/usr/include/byteswap.h b/8/platforms/android-9/arch-arm/usr/include/byteswap.h index 16d2ad4..74b0e91 100644 --- a/8/platforms/android-9/arch-arm/usr/include/byteswap.h +++ b/8/platforms/android-9/arch-arm/usr/include/byteswap.h @@ -28,7 +28,8 @@ #ifndef _BYTESWAP_H_ #define _BYTESWAP_H_ -#include <sys/endian.h> +/* endian.h rather than sys/endian.h so we get the machine-specific file. */ +#include <endian.h> #define bswap_16(x) swap16(x) #define bswap_32(x) swap32(x) diff --git a/8/platforms/android-9/arch-arm/usr/include/dirent.h b/8/platforms/android-9/arch-arm/usr/include/dirent.h index 55eef7b..f0a1e17 100644 --- a/8/platforms/android-9/arch-arm/usr/include/dirent.h +++ b/8/platforms/android-9/arch-arm/usr/include/dirent.h @@ -51,28 +51,29 @@ __BEGIN_DECLS * who assume to be able to access it directly. sad... */ struct dirent { - uint64_t d_ino; - int64_t d_off; - unsigned short d_reclen; - unsigned char d_type; - char d_name[256]; + uint64_t d_ino; + int64_t d_off; + unsigned short d_reclen; + unsigned char d_type; + char d_name[256]; }; -typedef struct DIR DIR; +typedef struct DIR DIR; -extern int getdents(unsigned int, struct dirent*, unsigned int); -extern DIR* opendir(const char* dirpath); +extern DIR* opendir(const char* dirpath); extern DIR* fdopendir(int fd); -extern struct dirent* readdir(DIR* dirp); -extern int readdir_r(DIR* dirp, struct dirent *entry, struct dirent **result); -extern int closedir(DIR* dirp); -extern void rewinddir(DIR *dirp); +extern struct dirent* readdir(DIR* dirp); +extern int readdir_r(DIR* dirp, struct dirent* entry, struct dirent** result); +extern int closedir(DIR* dirp); +extern void rewinddir(DIR* dirp); extern int dirfd(DIR* dirp); -extern int alphasort(const void *a, const void *b); -extern int scandir(const char *dir, struct dirent ***namelist, - int(*filter)(const struct dirent *), - int(*compar)(const struct dirent **, - const struct dirent **)); +extern int alphasort(const struct dirent** a, const struct dirent** b); +extern int scandir(const char* dir, struct dirent*** namelist, + int(*filter)(const struct dirent*), + int(*compar)(const struct dirent**, + const struct dirent**)); + +extern int getdents(unsigned int, struct dirent*, unsigned int); __END_DECLS diff --git a/8/platforms/android-9/arch-arm/usr/include/errno.h b/8/platforms/android-9/arch-arm/usr/include/errno.h index 2b2685a..e1b15c0 100644 --- a/8/platforms/android-9/arch-arm/usr/include/errno.h +++ b/8/platforms/android-9/arch-arm/usr/include/errno.h @@ -36,7 +36,7 @@ __BEGIN_DECLS /* on Linux, ENOTSUP and EOPNOTSUPP are defined as the same error code * even if 1000.3 states that they should be different */ -#ifndef ENOTUP +#ifndef ENOTSUP #define ENOTSUP EOPNOTSUPP #endif diff --git a/8/platforms/android-9/arch-arm/usr/include/limits.h b/8/platforms/android-9/arch-arm/usr/include/limits.h index 1de8ea6..b9d4354 100644 --- a/8/platforms/android-9/arch-arm/usr/include/limits.h +++ b/8/platforms/android-9/arch-arm/usr/include/limits.h @@ -89,7 +89,24 @@ #include <sys/syslimits.h> #endif +/* GLibc compatibility definitions. + Note that these are defined by GCC's <limits.h> + only when __GNU_LIBRARY__ is defined, i.e. when + targetting GLibc. */ +#ifndef LONG_LONG_MIN +#define LONG_LONG_MIN LLONG_MIN +#endif + +#ifndef LONG_LONG_MAX +#define LONG_LONG_MAX LLONG_MAX +#endif + +#ifndef ULONG_LONG_MAX +#define ULONG_LONG_MAX ULLONG_MAX +#endif + #ifndef PAGESIZE +#include <asm/page.h> #define PAGESIZE PAGE_SIZE #endif diff --git a/8/platforms/android-9/arch-arm/usr/include/machine/_types.h b/8/platforms/android-9/arch-arm/usr/include/machine/_types.h index 3e779ca..dbc4e9d 100644 --- a/8/platforms/android-9/arch-arm/usr/include/machine/_types.h +++ b/8/platforms/android-9/arch-arm/usr/include/machine/_types.h @@ -116,10 +116,4 @@ typedef int __rune_t; typedef void * __wctrans_t; typedef void * __wctype_t; -#ifdef __ARMEB__ -#define _BYTE_ORDER _BIG_ENDIAN -#else -#define _BYTE_ORDER _LITTLE_ENDIAN -#endif - #endif /* _ARM__TYPES_H_ */ diff --git a/8/platforms/android-9/arch-arm/usr/include/machine/endian.h b/8/platforms/android-9/arch-arm/usr/include/machine/endian.h new file mode 100644 index 0000000..7cba3b9 --- /dev/null +++ b/8/platforms/android-9/arch-arm/usr/include/machine/endian.h @@ -0,0 +1,89 @@ +/* $OpenBSD: endian.h,v 1.3 2005/12/13 00:35:23 millert Exp $ */ + +/* + * Copyright (C) 2010 The Android Open Source Project + * All rights reserved. + * + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "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 THE + * COPYRIGHT OWNER OR CONTRIBUTORS 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 _ARM_ENDIAN_H_ +#define _ARM_ENDIAN_H_ + +#ifdef __GNUC__ + +/* + * REV and REV16 weren't available on ARM5 or ARM4. + * We don't include <machine/cpu-features.h> because it pollutes the + * namespace with macros like PLD. + */ +#if !defined __ARM_ARCH_5__ && !defined __ARM_ARCH_5T__ && \ + !defined __ARM_ARCH_5TE__ && !defined __ARM_ARCH_5TEJ__ && \ + !defined __ARM_ARCH_4T__ && !defined __ARM_ARCH_4__ + +/* According to RealView Assembler User's Guide, REV and REV16 are available + * in Thumb code and 16-bit instructions when used in Thumb-2 code. + * + * REV Rd, Rm + * Rd and Rm must both be Lo registers. + * + * REV16 Rd, Rm + * Rd and Rm must both be Lo registers. + * + * The +l constraint takes care of this without constraining us in ARM mode. + */ +#define __swap16md(x) ({ \ + register u_int16_t _x = (x); \ + __asm volatile ("rev16 %0, %0" : "+l" (_x)); \ + _x; \ +}) + +#define __swap32md(x) ({ \ + register u_int32_t _x = (x); \ + __asm volatile ("rev %0, %0" : "+l" (_x)); \ + _x; \ +}) + +#define __swap64md(x) ({ \ + u_int64_t _swap64md_x = (x); \ + (u_int64_t) __swap32md(_swap64md_x >> 32) | \ + (u_int64_t) __swap32md(_swap64md_x & 0xffffffff) << 32; \ +}) + +/* Tell sys/endian.h we have MD variants of the swap macros. */ +#define MD_SWAP + +#endif /* __ARM_ARCH__ */ +#endif /* __GNUC__ */ + +#if defined(__ARMEB__) +#define _BYTE_ORDER _BIG_ENDIAN +#else +#define _BYTE_ORDER _LITTLE_ENDIAN +#endif +#define __STRICT_ALIGNMENT +#include <sys/types.h> +#include <sys/endian.h> + +#endif /* !_ARM_ENDIAN_H_ */ diff --git a/8/platforms/android-9/arch-arm/usr/include/pthread.h b/8/platforms/android-9/arch-arm/usr/include/pthread.h index 4baf82f..c3f055e 100644 --- a/8/platforms/android-9/arch-arm/usr/include/pthread.h +++ b/8/platforms/android-9/arch-arm/usr/include/pthread.h @@ -42,9 +42,13 @@ typedef struct int volatile value; } pthread_mutex_t; -#define PTHREAD_MUTEX_INITIALIZER {0} -#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER {0x4000} -#define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER {0x8000} +#define __PTHREAD_MUTEX_INIT_VALUE 0 +#define __PTHREAD_RECURSIVE_MUTEX_INIT_VALUE 0x4000 +#define __PTHREAD_ERRORCHECK_MUTEX_INIT_VALUE 0x8000 + +#define PTHREAD_MUTEX_INITIALIZER {__PTHREAD_MUTEX_INIT_VALUE} +#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER {__PTHREAD_RECURSIVE_MUTEX_INIT_VALUE} +#define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER {__PTHREAD_ERRORCHECK_MUTEX_INIT_VALUE} enum { PTHREAD_MUTEX_NORMAL = 0, @@ -306,9 +310,4 @@ extern void __pthread_cleanup_pop(__pthread_cleanup_t* c, } /* extern "C" */ #endif -/************ TO FIX ************/ - -#define LONG_LONG_MAX __LONG_LONG_MAX__ -#define LONG_LONG_MIN (-__LONG_LONG_MAX__ - 1) - #endif /* _PTHREAD_H_ */ diff --git a/8/platforms/android-9/arch-arm/usr/include/resolv.h b/8/platforms/android-9/arch-arm/usr/include/resolv.h index 4247d68..7c34012 100644 --- a/8/platforms/android-9/arch-arm/usr/include/resolv.h +++ b/8/platforms/android-9/arch-arm/usr/include/resolv.h @@ -34,6 +34,7 @@ #include <sys/socket.h> #include <stdio.h> #include <arpa/nameser.h> +#include <netinet/in.h> __BEGIN_DECLS diff --git a/8/platforms/android-9/arch-arm/usr/include/sys/cdefs.h b/8/platforms/android-9/arch-arm/usr/include/sys/cdefs.h index 849e2b8..92035d4 100644 --- a/8/platforms/android-9/arch-arm/usr/include/sys/cdefs.h +++ b/8/platforms/android-9/arch-arm/usr/include/sys/cdefs.h @@ -79,7 +79,7 @@ #define ___STRING(x) __STRING(x) #define ___CONCAT(x,y) __CONCAT(x,y) -#if __STDC__ || defined(__cplusplus) +#if defined(__STDC__) || defined(__cplusplus) #define __P(protos) protos /* full-blown ANSI C */ #define __CONCAT(x,y) x ## y #define __STRING(x) #x @@ -213,7 +213,7 @@ * C99 defines the restrict type qualifier keyword, which was made available * in GCC 2.92. */ -#if __STDC_VERSION__ >= 199901L +#if defined(__STDC__VERSION__) && __STDC_VERSION__ >= 199901L #define __restrict restrict #else #if !__GNUC_PREREQ__(2, 92) @@ -225,7 +225,7 @@ * C99 defines __func__ predefined identifier, which was made available * in GCC 2.95. */ -#if !(__STDC_VERSION__ >= 199901L) +#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L) #if __GNUC_PREREQ__(2, 6) #define __func__ __PRETTY_FUNCTION__ #elif __GNUC_PREREQ__(2, 4) @@ -497,5 +497,6 @@ #endif #define __BIONIC__ 1 +#include <android/api-level.h> #endif /* !_SYS_CDEFS_H_ */ diff --git a/8/platforms/android-9/arch-arm/usr/include/sys/endian.h b/8/platforms/android-9/arch-arm/usr/include/sys/endian.h index 00f4839..2a0c658 100644 --- a/8/platforms/android-9/arch-arm/usr/include/sys/endian.h +++ b/8/platforms/android-9/arch-arm/usr/include/sys/endian.h @@ -37,6 +37,7 @@ #define _SYS_ENDIAN_H_ #include <sys/cdefs.h> +#include <machine/endian.h> #include <machine/_types.h> #define _LITTLE_ENDIAN 1234 diff --git a/8/platforms/android-9/arch-arm/usr/include/wchar.h b/8/platforms/android-9/arch-arm/usr/include/wchar.h index 86d6d73..fea648c 100644 --- a/8/platforms/android-9/arch-arm/usr/include/wchar.h +++ b/8/platforms/android-9/arch-arm/usr/include/wchar.h @@ -51,7 +51,7 @@ __BEGIN_DECLS -typedef int wint_t; +typedef __WINT_TYPE__ wint_t; typedef struct { int dummy; } mbstate_t; typedef enum { diff --git a/8/platforms/android-9/arch-arm/usr/lib/libEGL.so b/8/platforms/android-9/arch-arm/usr/lib/libEGL.so Binary files differindex 66e8573..afbfeeb 100755 --- a/8/platforms/android-9/arch-arm/usr/lib/libEGL.so +++ b/8/platforms/android-9/arch-arm/usr/lib/libEGL.so diff --git a/8/platforms/android-9/arch-arm/usr/lib/libGLESv1_CM.so b/8/platforms/android-9/arch-arm/usr/lib/libGLESv1_CM.so Binary files differindex 4115550..7d2caa9 100755 --- a/8/platforms/android-9/arch-arm/usr/lib/libGLESv1_CM.so +++ b/8/platforms/android-9/arch-arm/usr/lib/libGLESv1_CM.so diff --git a/8/platforms/android-9/arch-arm/usr/lib/libGLESv2.so b/8/platforms/android-9/arch-arm/usr/lib/libGLESv2.so Binary files differindex cc6face..77d04a8 100755 --- a/8/platforms/android-9/arch-arm/usr/lib/libGLESv2.so +++ b/8/platforms/android-9/arch-arm/usr/lib/libGLESv2.so diff --git a/8/platforms/android-9/arch-arm/usr/lib/libOpenSLES.so b/8/platforms/android-9/arch-arm/usr/lib/libOpenSLES.so Binary files differindex fbc2836..8144d1f 100755 --- a/8/platforms/android-9/arch-arm/usr/lib/libOpenSLES.so +++ b/8/platforms/android-9/arch-arm/usr/lib/libOpenSLES.so diff --git a/8/platforms/android-9/arch-arm/usr/lib/libandroid.so b/8/platforms/android-9/arch-arm/usr/lib/libandroid.so Binary files differindex 8f0a0d3..f26444f 100755 --- a/8/platforms/android-9/arch-arm/usr/lib/libandroid.so +++ b/8/platforms/android-9/arch-arm/usr/lib/libandroid.so diff --git a/8/platforms/android-9/arch-arm/usr/lib/libc.so b/8/platforms/android-9/arch-arm/usr/lib/libc.so Binary files differindex 66e4659..e221ba7 100755 --- a/8/platforms/android-9/arch-arm/usr/lib/libc.so +++ b/8/platforms/android-9/arch-arm/usr/lib/libc.so diff --git a/8/platforms/android-9/arch-arm/usr/lib/libdl.so b/8/platforms/android-9/arch-arm/usr/lib/libdl.so Binary files differindex db32225..6e6f153 100755 --- a/8/platforms/android-9/arch-arm/usr/lib/libdl.so +++ b/8/platforms/android-9/arch-arm/usr/lib/libdl.so diff --git a/8/platforms/android-9/arch-arm/usr/lib/libjnigraphics.so b/8/platforms/android-9/arch-arm/usr/lib/libjnigraphics.so Binary files differindex 5624fae..3520daf 100755 --- a/8/platforms/android-9/arch-arm/usr/lib/libjnigraphics.so +++ b/8/platforms/android-9/arch-arm/usr/lib/libjnigraphics.so diff --git a/8/platforms/android-9/arch-arm/usr/lib/liblog.so b/8/platforms/android-9/arch-arm/usr/lib/liblog.so Binary files differindex efae74c..95a8044 100755 --- a/8/platforms/android-9/arch-arm/usr/lib/liblog.so +++ b/8/platforms/android-9/arch-arm/usr/lib/liblog.so diff --git a/8/platforms/android-9/arch-arm/usr/lib/libm.so b/8/platforms/android-9/arch-arm/usr/lib/libm.so Binary files differindex fd2dcd4..d3806df 100755 --- a/8/platforms/android-9/arch-arm/usr/lib/libm.so +++ b/8/platforms/android-9/arch-arm/usr/lib/libm.so diff --git a/8/platforms/android-9/arch-arm/usr/lib/libstdc++.so b/8/platforms/android-9/arch-arm/usr/lib/libstdc++.so Binary files differindex b011883..8f81027 100755 --- a/8/platforms/android-9/arch-arm/usr/lib/libstdc++.so +++ b/8/platforms/android-9/arch-arm/usr/lib/libstdc++.so diff --git a/8/platforms/android-9/arch-arm/usr/lib/libthread_db.so b/8/platforms/android-9/arch-arm/usr/lib/libthread_db.so Binary files differindex 8eabe7f..c849efa 100755 --- a/8/platforms/android-9/arch-arm/usr/lib/libthread_db.so +++ b/8/platforms/android-9/arch-arm/usr/lib/libthread_db.so diff --git a/8/platforms/android-9/arch-arm/usr/lib/libz.so b/8/platforms/android-9/arch-arm/usr/lib/libz.so Binary files differindex d3c94b9..a1e360e 100755 --- a/8/platforms/android-9/arch-arm/usr/lib/libz.so +++ b/8/platforms/android-9/arch-arm/usr/lib/libz.so |