Commit Graph

10056 Commits

Author SHA1 Message Date
Andrew Hsieh
2384a4dcee am d63680fb: am 9487df9a: Merge "Remove auto-gen project.properties"
* commit 'd63680fbc4da40fc6b29039e04d6a38137d38021':
  Remove auto-gen project.properties
2012-04-02 07:58:15 -07:00
Andrew Hsieh
7cd62f769c am ed42b4b0: am 2bbd700e: Merge "ndk: <dlfcn.h>: dladdr() takes a \'const void*\' parameter, not \'void*\'"
* commit 'ed42b4b02d1514f72664a9d6865a5523676403ed':
  ndk: <dlfcn.h>: dladdr() takes a 'const void*' parameter, not 'void*'
2012-04-02 07:58:14 -07:00
Andrew Hsieh
45499a4402 am e3f5656b: am 48aaee2c: Merge "Native media sample app for NDK API level 14"
* commit 'e3f5656b942ed46ee9857e2819b5eef40ba95e9b':
  Native media sample app for NDK API level 14
2012-04-02 07:58:13 -07:00
Andrew Hsieh
12866f38d3 am 93e83437: am 2c10ade9: Merge "ndk: android-9: Add missing <sys/eventfd.h> header"
* commit '93e83437cc2b396033d3e5f5ec7e1e4c88b33cbe':
  ndk: android-9: Add missing <sys/eventfd.h> header
2012-04-02 07:58:12 -07:00
Andrew Hsieh
aef6a76afb am f12cbd40: am ea94d94a: Merge "ndk: <signal.h>: Increase _NSIG definition to 64"
* commit 'f12cbd4097f0d5557eb250c63785348b57bb552a':
  ndk: <signal.h>: Increase _NSIG definition to 64
2012-04-02 07:58:11 -07:00
Andrew Hsieh
a3f30dbed7 am 964684ba: am 535478dd: Merge "ndk: <pthread.h>: formatting + updates"
* commit '964684ba5b1a9254d1505b0ac9cc6fd43c5db1c9':
  ndk: <pthread.h>: formatting + updates
2012-04-02 07:58:10 -07:00
Andrew Hsieh
d3d90fb611 am 87d906b2: am 5f37cda9: Merge "ndk: <unistd.h>: minor cleanup"
* commit '87d906b24376757b8b82d49698bb4731e3e9ad94':
  ndk: <unistd.h>: minor cleanup
2012-04-02 07:58:09 -07:00
Andrew Hsieh
60df0c2b83 am 1f52f49c: am 3e7f4c62: Merge "ndk: <sys/cdefs.h> minor update"
* commit '1f52f49c350f68b66e929131ecd7d793e05503e1':
  ndk: <sys/cdefs.h> minor update
2012-04-02 07:58:07 -07:00
Andrew Hsieh
84bd1184b9 am b8e1cdda: am 7ae589ca: Merge "ndk: minor header update"
* commit 'b8e1cdda80fb3aee075e3633c7c0818e21e33ea9':
  ndk: minor header update
2012-04-02 07:58:06 -07:00
Andrew Hsieh
e00aea9715 am 2128eb22: am 61e72dbc: Merge "ndk: Fix ipv6 related headers"
* commit '2128eb22fd24ff4c6ec955f79950e0cebf7e448c':
  ndk: Fix ipv6 related headers
2012-04-02 07:58:06 -07:00
Andrew Hsieh
b907051f10 am 708a75ba: am ad05e868: Merge "ndk: Fix <sys/atomics.h> declarations."
* commit '708a75ba605e9801d704cc3f6d5168a0f849f7a9':
  ndk: Fix <sys/atomics.h> declarations.
2012-04-02 07:58:05 -07:00
Andrew Hsieh
95b9de9149 am 0480b898: am 26f8b539: Merge "ndk: minor update to <netinet/...> headers."
* commit '0480b898713f17ab9fd89e88637403c51fbca30b':
  ndk: minor update to <netinet/...> headers.
2012-04-02 07:58:04 -07:00
Andrew Hsieh
d63680fbc4 am 9487df9a: Merge "Remove auto-gen project.properties"
* commit '9487df9a0f54bc1b572dff04a6b4c9f741d88d42':
  Remove auto-gen project.properties
2012-04-02 07:55:47 -07:00
Andrew Hsieh
ed42b4b02d am 2bbd700e: Merge "ndk: <dlfcn.h>: dladdr() takes a \'const void*\' parameter, not \'void*\'"
* commit '2bbd700ef64579a9b0abcf1a538294ae0b1fec3d':
  ndk: <dlfcn.h>: dladdr() takes a 'const void*' parameter, not 'void*'
2012-04-02 07:55:46 -07:00
Andrew Hsieh
e3f5656b94 am 48aaee2c: Merge "Native media sample app for NDK API level 14"
* commit '48aaee2cd0ca157b4c789bf017cd2ff6e9404664':
  Native media sample app for NDK API level 14
2012-04-02 07:55:44 -07:00
Andrew Hsieh
93e83437cc am 2c10ade9: Merge "ndk: android-9: Add missing <sys/eventfd.h> header"
* commit '2c10ade96c1eb1f9849eacecfd3739ccbd668e42':
  ndk: android-9: Add missing <sys/eventfd.h> header
2012-04-02 07:55:43 -07:00
Andrew Hsieh
f12cbd4097 am ea94d94a: Merge "ndk: <signal.h>: Increase _NSIG definition to 64"
* commit 'ea94d94a3b248e290aa66b71625b72f17814eacc':
  ndk: <signal.h>: Increase _NSIG definition to 64
2012-04-02 07:55:37 -07:00
Andrew Hsieh
964684ba5b am 535478dd: Merge "ndk: <pthread.h>: formatting + updates"
* commit '535478dd4de9bfe4cf4668d6d767ce48e2919f69':
  ndk: <pthread.h>: formatting + updates
2012-04-02 07:55:36 -07:00
Andrew Hsieh
87d906b243 am 5f37cda9: Merge "ndk: <unistd.h>: minor cleanup"
* commit '5f37cda9b9cca301c839e868464ab4890c2c7c9e':
  ndk: <unistd.h>: minor cleanup
2012-04-02 07:55:35 -07:00
Andrew Hsieh
1f52f49c35 am 3e7f4c62: Merge "ndk: <sys/cdefs.h> minor update"
* commit '3e7f4c62a242d9aeaf91d7b5590959d96ffbc730':
  ndk: <sys/cdefs.h> minor update
2012-04-02 07:55:34 -07:00
Andrew Hsieh
b8e1cdda80 am 7ae589ca: Merge "ndk: minor header update"
* commit '7ae589ca49c8a37f52712101476c6cd664cc7e08':
  ndk: minor header update
2012-04-02 07:55:33 -07:00
Andrew Hsieh
2128eb22fd am 61e72dbc: Merge "ndk: Fix ipv6 related headers"
* commit '61e72dbc24de26fd54e09a30ec9e74ee9a22c306':
  ndk: Fix ipv6 related headers
2012-04-02 07:55:32 -07:00
Andrew Hsieh
708a75ba60 am ad05e868: Merge "ndk: Fix <sys/atomics.h> declarations."
* commit 'ad05e868b8f4a4e57bffcdbf5ffdfff5d3f8c92b':
  ndk: Fix <sys/atomics.h> declarations.
2012-04-02 07:55:30 -07:00
Andrew Hsieh
0480b89871 am 26f8b539: Merge "ndk: minor update to <netinet/...> headers."
* commit '26f8b5393020c1b8a569e8bb659c7bd8ed6ef796':
  ndk: minor update to <netinet/...> headers.
2012-04-02 07:55:29 -07:00
The Android Automerger
2ecb2ce4d2 merge in jb-release history after reset to master 2012-04-02 07:00:47 -07:00
Andrew Hsieh
9487df9a0f Merge "Remove auto-gen project.properties" 2012-04-02 03:36:57 -07:00
Andrew Hsieh
3f59495d17 Remove auto-gen project.properties
It's auto-gen by tool from default.properties in the same dir, etc.

Change-Id: I081ecb809699d42b707218b08e61b97fc9a51f1a
2012-04-02 18:32:04 +08:00
Andrew Hsieh
2bbd700ef6 Merge "ndk: <dlfcn.h>: dladdr() takes a 'const void*' parameter, not 'void*'" 2012-04-02 03:16:37 -07:00
David 'Digit' Turner
b2f20362ac 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.
2012-04-02 18:15:50 +08:00
Andrew Hsieh
48aaee2cd0 Merge "Native media sample app for NDK API level 14" 2012-04-02 03:13:45 -07:00
Glenn Kasten
00038deedc Native media sample app for NDK API level 14 2012-04-02 18:08:03 +08:00
Andrew Hsieh
2c10ade96c Merge "ndk: android-9: Add missing <sys/eventfd.h> header" 2012-04-02 03:06:50 -07:00
David 'Digit' Turner
e43487b854 ndk: android-9: Add missing <sys/eventfd.h> header
For some reason, the header was missing from previous NDK releases.
Note: the function symbols are properly listed in arch-$ARCH/symbols/libc.so.functions.txt
2012-04-02 18:05:57 +08:00
Andrew Hsieh
ea94d94a3b Merge "ndk: <signal.h>: Increase _NSIG definition to 64" 2012-04-02 03:03:52 -07:00
David 'Digit' Turner
ef0d31ec73 ndk: <signal.h>: Increase _NSIG definition to 64
This is a minor update to this NDK header to better match the upstream definition.
2012-04-02 18:03:00 +08:00
Andrew Hsieh
535478dd4d Merge "ndk: <pthread.h>: formatting + updates" 2012-04-02 03:01:46 -07:00
David 'Digit' Turner
015d0543d2 ndk: <pthread.h>: formatting + updates
This patch improves the formatting of <pthread.h> as exposed by the NDK:

- change '#if __cplusplus' into '#ifdef __cplusplus'
- change C++-style comment into C-style comment

Change-Id: Ib093058e8d7a7554d8329a40e102cde11d065932
2012-04-02 17:59:26 +08:00
Andrew Hsieh
5f37cda9b9 Merge "ndk: <unistd.h>: minor cleanup" 2012-04-02 02:56:37 -07:00
David 'Digit' Turner
002d5366b6 ndk: <unistd.h>: minor cleanup
- 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: I3c9420e328c3772bbb57dc9108dc879aa698a981
2012-04-02 17:54:27 +08:00
Andrew Hsieh
3e7f4c62a2 Merge "ndk: <sys/cdefs.h> minor update" 2012-04-02 02:42:37 -07:00
David 'Digit' Turner
3da072d28f ndk: <sys/cdefs.h> minor update
This patch fixes some formatting issues in <sys/cdefs.h>:

- change '#if __STDC_VERSION__ > xxx' into '#if defined(__STDC_VERSION__) && __STDC_VERSION > xxx'
- add __LIBC_HIDDEN__ definition (not technically required, but makes comparing the headers with upstream easier)
2012-04-02 17:41:16 +08:00
Andrew Hsieh
7ae589ca49 Merge "ndk: minor header update" 2012-04-02 01:08:05 -07:00
David 'Digit' Turner
1fe0de682b ndk: minor header update
<net/ethernet.h>: new header
<netdb.h>: add EAI_ADDRFAMILY definition
2012-04-02 16:07:07 +08:00
Andrew Hsieh
61e72dbc24 Merge "ndk: Fix ipv6 related headers" 2012-04-02 01:05:31 -07:00
David 'Digit' Turner
f4e62ff4a3 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>
2012-04-02 16:04:42 +08:00
Andrew Hsieh
ad05e868b8 Merge "ndk: Fix <sys/atomics.h> declarations." 2012-04-02 01:01:39 -07:00
David 'Digit' Turner
6c32dacf97 ndk: Fix <sys/atomics.h> declarations.
The atomic operations exported by the platform's C library do not
provide full memory barriers. This can result in incorrect results
when NDK machine code linked against them runs on multi-core devices.

While the bug has been fixed in the platform, this NDK header change
ensures that any source code that includes <sys/atomics.h> will end
up using a correct implementation of these functions, based on the
corresponding GCC builtins.

These builtins always provide a full barrier and have reasonable
performance. Application developers who depend on <sys/atomics.h>
should recompile their unmodified sources against this version
of the NDK as soon as possible.
2012-04-02 15:59:46 +08:00
Andrew Hsieh
26f8b53930 Merge "ndk: minor update to <netinet/...> headers." 2012-04-02 00:56:56 -07:00
Andrew Hsieh
4e751123b9 am 04178e1c: am ea046fad: am ee8746da: Merge "ndk: libc: Add RLIM_RTTIME to <asm-generic/resource.h>"
* commit '04178e1cab7317471e329cb0e0000415637a6079':
  ndk: libc: Add RLIM_RTTIME to <asm-generic/resource.h>
2012-04-02 00:46:02 -07:00
Andrew Hsieh
506c606e92 am 54ee243d: am a4c42802: am 3211c04a: Merge "ndk: arm: Update <asm/ptrace.h> and <asm/user.h>"
* commit '54ee243d1e02710cc8c506172bc1700bce50527a':
  ndk: arm: Update <asm/ptrace.h> and <asm/user.h>
2012-04-02 00:46:01 -07:00