Xavier Ducrohet
71c175fccd
am a318515c: Merge "Move platform 15 sdk rev to 2. do not merge." into ics-mr1
...
* commit 'a318515c0d160122313a8e87d9002d957e8789b6':
Move platform 15 sdk rev to 2. do not merge.
2012-01-11 17:10:29 -08:00
Xavier Ducrohet
3393b3ae2b
am a318515c: Merge "Move platform 15 sdk rev to 2. do not merge." into ics-mr1
...
* commit 'a318515c0d160122313a8e87d9002d957e8789b6':
Move platform 15 sdk rev to 2. do not merge.
2012-01-11 17:10:27 -08:00
Xavier Ducrohet
a318515c0d
Merge "Move platform 15 sdk rev to 2. do not merge." into ics-mr1
2012-01-11 17:08:47 -08:00
Xavier Ducrohet
e4627619b3
Move platform 15 sdk rev to 2. do not merge.
...
Change-Id: I8c3ab6cce4305afcd380b23ed0638169676d5d97
2012-01-11 17:08:18 -08:00
The Android Automerger
c8b86c1add
merge in ics-mr1-release history after reset to ics-mr1
2012-01-11 16:28:10 -08:00
Katie McCormick
71f9a53def
am 6588fb68: am 811d1dd3: am e065fd62: Merge "Doc change: updated index page for HDP sample." into ics-mr1
...
* commit '6588fb68eca45b8a6872b0f82eaffcbf8375a6c7':
Doc change: updated index page for HDP sample.
2012-01-11 16:09:40 -08:00
Katie McCormick
6588fb68ec
am 811d1dd3: am e065fd62: Merge "Doc change: updated index page for HDP sample." into ics-mr1
...
* commit '811d1dd339adc9f005d34611ffbf0d4ded4c9fa8':
Doc change: updated index page for HDP sample.
2012-01-11 16:07:33 -08:00
Katie McCormick
f7f567df37
am e065fd62: Merge "Doc change: updated index page for HDP sample." into ics-mr1
...
* commit 'e065fd6209926814df312623a2a8230518e738c0':
Doc change: updated index page for HDP sample.
2012-01-11 16:05:13 -08:00
Katie McCormick
811d1dd339
am e065fd62: Merge "Doc change: updated index page for HDP sample." into ics-mr1
...
* commit 'e065fd6209926814df312623a2a8230518e738c0':
Doc change: updated index page for HDP sample.
2012-01-11 16:05:06 -08:00
Katie McCormick
e065fd6209
Merge "Doc change: updated index page for HDP sample." into ics-mr1
2012-01-11 16:02:50 -08:00
Jesse Hall
5bad48a65e
EmuGL: handle NULL data in glBufferData
...
The data pointer argument to glBufferData can be NULL; this
[re]allocates the buffer while leaving the contents undefined.
Bug: 5833436
Change-Id: Ia1ddf62e2cd2c59d3d631e01d23d7c557ca5a52e
2012-01-11 15:40:29 -08:00
Dianne Hackborn
3374f30c50
am d2f0e466: am 2492079b: am 0b6b4f2d: Merge "Fix notification sample to follow current UI guidelines." into ics-mr1
...
* commit 'd2f0e4667fd096094d8a4ea4f4f25db1a23675ad':
Fix notification sample to follow current UI guidelines.
2012-01-11 10:59:14 -08:00
Dianne Hackborn
d2f0e4667f
am 2492079b: am 0b6b4f2d: Merge "Fix notification sample to follow current UI guidelines." into ics-mr1
...
* commit '2492079bb859b689adc1ff5504bfc274a9ba07ee':
Fix notification sample to follow current UI guidelines.
2012-01-11 10:56:42 -08:00
Dianne Hackborn
2704b66b52
am 0b6b4f2d: Merge "Fix notification sample to follow current UI guidelines." into ics-mr1
...
* commit '0b6b4f2d195f8224e19b66e5c266a7fd798f321d':
Fix notification sample to follow current UI guidelines.
2012-01-11 10:54:45 -08:00
Dianne Hackborn
2492079bb8
am 0b6b4f2d: Merge "Fix notification sample to follow current UI guidelines." into ics-mr1
...
* commit '0b6b4f2d195f8224e19b66e5c266a7fd798f321d':
Fix notification sample to follow current UI guidelines.
2012-01-11 10:54:42 -08:00
Dianne Hackborn
0b6b4f2d19
Merge "Fix notification sample to follow current UI guidelines." into ics-mr1
2012-01-11 10:53:25 -08:00
The Android Automerger
5bde78cb8d
merge in ics-release history after reset to master
2012-01-11 10:15:08 -08:00
David 'Digit' Turner
38b63f3f28
am af4519e9: ndk: Fix ipv6 related headers
...
* commit 'af4519e9537c17cebc23b8e7b67a83dcfc6ee495':
ndk: Fix ipv6 related headers
2012-01-11 09:16:24 -08:00
David 'Digit' Turner
af4519e953
ndk: Fix ipv6 related headers
...
This fixes two minor issues with recent updates to the IPv6 related headers:
- add missing <linux/ipv6.h> kernel header
- avoid conflict in netinet/in6.h, the macro is already defined by <linux/in6.h>
Change-Id: Ibd0d44fd801affc6ca405e96982a73f9a630bdba
2012-01-11 17:36:09 +01:00
David 'Digit' Turner
2b88e703f8
am e56aece8: ndk: API level 14: Add C library symbol files
...
* commit 'e56aece818523fb34969cb09d61e15b89fa1efae':
ndk: API level 14: Add C library symbol files
2012-01-11 06:59:16 -08:00
David 'Digit' Turner
1b57e10d06
am c8357964: ndk: API level 12: Add ARM libc symbol files
...
* commit 'c8357964fced62cef1138d77c11469c84020fc51':
ndk: API level 12: Add ARM libc symbol files
2012-01-11 06:59:16 -08:00
David 'Digit' Turner
e02e891a7b
am 7d8f5ae2: ndk: API level 11: Add libc.so + libm.so symbol files
...
* commit '7d8f5ae269659360058cf0df51ed47f72fb6d6d4':
ndk: API level 11: Add libc.so + libm.so symbol files
2012-01-11 06:59:15 -08:00
David 'Digit' Turner
e56aece818
ndk: API level 14: Add C library symbol files
...
Symbols for both arm and x86.
+ missing declarations for getpwnam_r and getpwuid_r which were implemented
in Android 4.0.1. This didn't appear in previous comparison because the
platform header always declare these in <pwd.h>, so it never changed
when the functions were added. They appear in libc.so.functions.txt though.
The arm symbols are generated from the library files extracted from the
'yakju' platform build for 4.0.1 a.k.a. ITL41D.
The x86 symbols are generated by building the corresponding libraries
for the full_x86-eng product, using the same Bionic sources.
+ x86: Add missing symbols for "siglongjmp" and "sigsetjmp" which are not
exported by the gingerbread version of full_x86-eng libc.so. This was
checked with a fresh build of the product from the current gingerbread
tree on the AOSP server. Probably a bug, but a minor one.
Change-Id: I41d3eb28cecc1989e1bec4a00ac236c4b262c2be
2012-01-11 15:55:11 +01:00
David 'Digit' Turner
c8357964fc
ndk: API level 12: Add ARM libc symbol files
...
Extracted from the tervigon build for android-3.1_r1 a.k.a. HMJ37
Change-Id: Idd914b3a4879174f98569b3a9bbb6cf3d48ef221
2012-01-11 15:53:50 +01:00
David 'Digit' Turner
7d8f5ae269
ndk: API level 11: Add libc.so + libm.so symbol files
...
Only for arm, since oneycomb isn't supported on x86
(i.e. API levels 11 to 13).
Change-Id: I662400ed7e222ea070dd1f9f6681c21971b589e1
ndk: API level 11: Add libm.so symbols for ARM
Change-Id: I5688b57557ad7021d49f458e1b9519e8800d795e
2012-01-11 15:48:37 +01:00
David 'Digit' Turner
07d1c4d53a
am 485ea2e3: ndk: <sys/stat.h>: Add utimensat() to API level 12
...
* commit '485ea2e3d26c4c107c01380ecba5ad33ed6521b2':
ndk: <sys/stat.h>: Add utimensat() to API level 12
2012-01-11 02:45:17 -08:00
David 'Digit' Turner
e2c5a3df6d
am a58e7602: ndk: arm: Update <asm/ptrace.h> and <asm/user.h>
...
* commit 'a58e7602fe5cb6fe7eacb777753f39e4caa6ef0d':
ndk: arm: Update <asm/ptrace.h> and <asm/user.h>
2012-01-11 02:43:36 -08:00
David 'Digit' Turner
ce4b2e129f
am 21fc12da: ndk: libc: Add RLIM_RTTIME to <asm-generic/resource.h>
...
* commit '21fc12da17a47d3fd16803fa05d95a519fae48b7':
ndk: libc: Add RLIM_RTTIME to <asm-generic/resource.h>
2012-01-11 02:43:35 -08:00
David 'Digit' Turner
4e16ed6865
am fe012f59: ndk: <dlfcn.h>: dladdr() takes a \'const void*\' parameter, not \'void*\'
...
* commit 'fe012f597f0055956c51ea9196b8b3f0c57b6c24':
ndk: <dlfcn.h>: dladdr() takes a 'const void*' parameter, not 'void*'
2012-01-11 02:43:35 -08:00
David 'Digit' Turner
1992a08905
am 8e286273: ndk: <wchar.h>: Add wcscasecmp and wcsncasecmp for API level 11
...
* commit '8e2862730a332113bfd8647313925ba377ce1c74':
ndk: <wchar.h>: Add wcscasecmp and wcsncasecmp for API level 11
2012-01-11 02:43:34 -08:00
David 'Digit' Turner
82b45dd417
am 47c55f4a: ndk: <unistd.h>: Update for API level 11 + minor cleanup
...
* commit '47c55f4af25c5eba2c2f7551e6090cfd483124ab':
ndk: <unistd.h>: Update for API level 11 + minor cleanup
2012-01-11 02:43:33 -08:00
David 'Digit' Turner
b4893dcd30
am bca64023: ndk: <time.h>: Add new time functions to API level 11
...
* commit 'bca64023986a0660655ab177f40117385b3b4b6b':
ndk: <time.h>: Add new time functions to API level 11
2012-01-11 02:43:33 -08:00
David 'Digit' Turner
01f49c5748
am 3970aef4: ndk: <stdlib.h>: Add mkdtemp() for API level 11
...
* commit '3970aef4d3dcf2186fe65a72fb8a5ad82dc2dd72':
ndk: <stdlib.h>: Add mkdtemp() for API level 11
2012-01-11 02:43:32 -08:00
David 'Digit' Turner
6e26e48d99
am fed3dfbb: ndk: <signal.h>: Increase _NSIG definition to 64
...
* commit 'fed3dfbb08354bf1dfc85b974ac4dcdacfad6f9f':
ndk: <signal.h>: Increase _NSIG definition to 64
2012-01-11 02:41:48 -08:00
David 'Digit' Turner
50c93aa08e
am aa566ea2: ndk: <sched.h>: Add cpu_set_t and related functions to API level 11
...
* commit 'aa566ea2561036ed9ea4dcd71251e8959e0eb95b':
ndk: <sched.h>: Add cpu_set_t and related functions to API level 11
2012-01-11 02:41:45 -08:00
David 'Digit' Turner
e439629d2e
am bea05255: ndk: <sys/cdefs.h> minor update
...
* commit 'bea05255de4372e7c2d41489b637338f59df9361':
ndk: <sys/cdefs.h> minor update
2012-01-11 02:41:44 -08:00
David 'Digit' Turner
30b2b7e595
am e4f25282: ndk: <pthread.h>: formatting + updates
...
* commit 'e4f252821e642b0fa67d8aa57af2d8cc81538764':
ndk: <pthread.h>: formatting + updates
2012-01-11 02:41:43 -08:00
David 'Digit' Turner
ddf0a504c0
am 42dddab4: ndk: minor header update
...
* commit '42dddab4d64dc1c51d25f135cf82da2e4851d780':
ndk: minor header update
2012-01-11 02:41:42 -08:00
David 'Digit' Turner
e57b4174eb
am 15af16fd: ndk: minor update to <netinet/...> headers.
...
* commit '15af16fdf2f408dd65c2a1230647bcb64a5c1bd9':
ndk: minor update to <netinet/...> headers.
2012-01-11 02:39:54 -08:00
David 'Digit' Turner
ab3a159632
am e0ff9880: ndk: android-9: Add missing <sys/eventfd.h> header
...
* commit 'e0ff98803fec8feb345b898371e45c4750a1278f':
ndk: android-9: Add missing <sys/eventfd.h> header
2012-01-11 02:39:54 -08:00
David 'Digit' Turner
485ea2e3d2
ndk: <sys/stat.h>: Add utimensat() to API level 12
...
Change-Id: If7e0ac5890c3dd2288f2d7541f6f92cd695bff97
2012-01-11 11:29:11 +01:00
David 'Digit' Turner
a58e7602fe
ndk: arm: Update <asm/ptrace.h> and <asm/user.h>
...
This is a minor update to two ARM-specific kernel headers.
- <asm/ptrace.h>: Add two new constants
- <asm/user.h>: Add 'struct vfp_user' and 'struct vfp_user_exc'
Change-Id: I25d31bb33a9102e3c74a169c28dce66211ced636
2012-01-11 11:29:11 +01:00
David 'Digit' Turner
21fc12da17
ndk: libc: Add RLIM_RTTIME to <asm-generic/resource.h>
...
This is a back-port of a fix that was performed in 4.0.1 to all previous platforms.
Change-Id: Ie4da3564913c22e815e37b1b000080b9bd06e3ad
2012-01-11 11:29:11 +01:00
David 'Digit' Turner
fe012f597f
ndk: <dlfcn.h>: dladdr() takes a 'const void*' parameter, not 'void*'
...
This is a back-port to API level 8 of a non-ABI-breaking change of the declaration.
Change-Id: I4f573da12c9cbd908afb5b646f018033bbe82503
2012-01-11 11:29:11 +01:00
David 'Digit' Turner
8e2862730a
ndk: <wchar.h>: Add wcscasecmp and wcsncasecmp for API level 11
...
Change-Id: Ibb399798b159405f4e059c823601d600a7953f0d
2012-01-11 11:29:11 +01:00
David 'Digit' Turner
47c55f4af2
ndk: <unistd.h>: Update for API level 11 + minor cleanup
...
- Add pread64(), pwrite64(), ftruncate64() for API level 11
- Cleanup declaration of lseek64() to use off64_t instead of loff_t
- Cleanup declaration of prctl() to use variable number of arguments
The cleanups are performed to better match upstream.
Change-Id: Ic9e44c0ea3dc1202d3c3478bdb2b6006e83b08dc
2012-01-11 11:29:10 +01:00
David 'Digit' Turner
bca6402398
ndk: <time.h>: Add new time functions to API level 11
...
This patch adds timegm(), timelocal(), time2posix() and posix2time()
to this standard library header.
Change-Id: Ic7b42eece8c11eb040d0522ed8b54d36b7404f9a
2012-01-11 11:29:10 +01:00
David 'Digit' Turner
3970aef4d3
ndk: <stdlib.h>: Add mkdtemp() for API level 11
...
Change-Id: Ic51ba2fe06e2a62c8ca467e88cef9988c50849df
2012-01-11 11:29:10 +01:00
David 'Digit' Turner
fed3dfbb08
ndk: <signal.h>: Increase _NSIG definition to 64
...
This is a minor update to this NDK header to better match the upstream definition.
Change-Id: I7b7e84b65f7a45d6395ba9831ee72ad120f989db
2012-01-11 11:29:10 +01:00
David 'Digit' Turner
aa566ea256
ndk: <sched.h>: Add cpu_set_t and related functions to API level 11
...
Add the following definitions related to cpu affinity to <sched.h>:
- cpu_set_t and associated macros: CPU_ZERO, CPU_SET, CPU_CLR, CPU_ISSET, CPU_EQUAL,
CPU_COUNT, CPU_AND, CPU_OR, CPU_XOR.
- sched_getcpu(), sched_getaffinity() and sched_setaffinity()
- define macros for dynamically-sized cpu_set_t variables, i.e.:
CPU_ALLOC_SIZE, CPU_ALLOC, CPU_FREE, CPU_ZERO_S, CPU_SET_S, CPU_CLR_S,
CPU_ISSET_S, CPU_EQUAL_S, CPU_COUNT_S
NOTE: You must define _GNU_SOURCE before including the header to get them.
Change-Id: I37338573c7af092118e7987420f6a930b6cc24b1
2012-01-11 11:29:10 +01:00