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
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
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
04178e1cab
am ea046fad: am ee8746da: Merge "ndk: libc: Add RLIM_RTTIME to <asm-generic/resource.h>"
...
* commit 'ea046fadf5df120738a2eb45e42ca6891e4e3dbd':
ndk: libc: Add RLIM_RTTIME to <asm-generic/resource.h>
2012-04-02 00:43:58 -07:00
Andrew Hsieh
54ee243d1e
am a4c42802: am 3211c04a: Merge "ndk: arm: Update <asm/ptrace.h> and <asm/user.h>"
...
* commit 'a4c42802df0e2245a6915e9a850a0ad10f35225c':
ndk: arm: Update <asm/ptrace.h> and <asm/user.h>
2012-04-02 00:43:57 -07:00
Andrew Hsieh
672ab2a395
am 15b930a3: am a9adb11a: Merge "ndk: disable logs in release builds of native_app_glue library."
...
* commit '15b930a3e1593315af61b5999a9fd873557e76c2':
ndk: disable logs in release builds of native_app_glue library.
2012-04-02 00:43:56 -07:00
Andrew Hsieh
3e5127efe4
am 7ea377d2: am ac1d40cf: Merge "Fixed inconsistent minSdkVersion and target= in NDK samples"
...
* commit '7ea377d2a7f8557545259698e6d8e4536ceadc2a':
Fixed inconsistent minSdkVersion and target= in NDK samples
2012-04-02 00:43:55 -07:00
Andrew Hsieh
4ab5bd9deb
am 0117043e: am 7a17a9af: Merge "Fixed to #include correct 32-bit headers"
...
* commit '0117043e299fe5c8b9b2d3d00d05e76526c2e017':
Fixed to #include correct 32-bit headers
2012-04-02 00:43:55 -07:00
Andrew Hsieh
ea046fadf5
am ee8746da: Merge "ndk: libc: Add RLIM_RTTIME to <asm-generic/resource.h>"
...
* commit 'ee8746daba45a79e32bfb0946f4ac9677cc4cafe':
ndk: libc: Add RLIM_RTTIME to <asm-generic/resource.h>
2012-04-02 00:41:49 -07:00
Andrew Hsieh
a4c42802df
am 3211c04a: Merge "ndk: arm: Update <asm/ptrace.h> and <asm/user.h>"
...
* commit '3211c04af13ce0d5a5280fa0ba6cdcd5760a542e':
ndk: arm: Update <asm/ptrace.h> and <asm/user.h>
2012-04-02 00:41:48 -07:00
Andrew Hsieh
15b930a3e1
am a9adb11a: Merge "ndk: disable logs in release builds of native_app_glue library."
...
* commit 'a9adb11aaee79fb74a89025f41d4206a565bf6a3':
ndk: disable logs in release builds of native_app_glue library.
2012-04-02 00:41:47 -07:00
Andrew Hsieh
7ea377d2a7
am ac1d40cf: Merge "Fixed inconsistent minSdkVersion and target= in NDK samples"
...
* commit 'ac1d40cf4fae70533a18205e4a6736b198aa8251':
Fixed inconsistent minSdkVersion and target= in NDK samples
2012-04-02 00:41:46 -07:00
Andrew Hsieh
0117043e29
am 7a17a9af: Merge "Fixed to #include correct 32-bit headers"
...
* commit '7a17a9aff795e9ae17de50b5001bef8412f3e300':
Fixed to #include correct 32-bit headers
2012-04-02 00:41:44 -07:00
David 'Digit' Turner
5704b40d70
ndk: minor update to <netinet/...> headers.
...
This patch contains a minor update to the netinet headers from the C library.
Most of the changes come from later platform release, but can be safely back-ported
to previous API levels since they don't change the ABI:
- <netinet/icmp6.h>, <netinet/ip6.h>: new headers
- <netinet/in.h>: now always include <linux/ipv6.h> by default
- <netinet/in6.h>: add macros: IN6_IS_ADDR_ULA, IN6ADDR_LOOPBACK_INIT
- <netinet/ip.h>: add macro: IPTOS_MINCOST
- <net/if_ether.h>: always include <sys/types.h> by default.
2012-04-02 15:31:20 +08:00
Andrew Hsieh
ee8746daba
Merge "ndk: libc: Add RLIM_RTTIME to <asm-generic/resource.h>"
2012-04-02 00:15:32 -07:00
David 'Digit' Turner
554c5eca78
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.
2012-04-02 15:14:10 +08:00
Andrew Hsieh
3211c04af1
Merge "ndk: arm: Update <asm/ptrace.h> and <asm/user.h>"
2012-04-02 00:12:14 -07:00
David 'Digit' Turner
34c6c855bc
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'
2012-04-02 15:11:02 +08:00
Andrew Hsieh
a9adb11aae
Merge "ndk: disable logs in release builds of native_app_glue library."
2012-04-02 00:08:08 -07:00
David 'Digit' Turner
e938d97d6b
ndk: disable logs in release builds of native_app_glue library.
...
This patch disables all the logs from the 'native_app_glue' helper
library (used to implement native activities with the NDK), unless
you're building a debug build.
2012-04-02 15:06:11 +08:00
Andrew Hsieh
ac1d40cf4f
Merge "Fixed inconsistent minSdkVersion and target= in NDK samples"
2012-04-02 00:00:56 -07:00
Andrew Hsieh
a79e56e2f8
Fixed inconsistent minSdkVersion and target= in NDK samples
...
Also removed Dummy.java and auto-gen files
Inspired by http://code.google.com/p/android/issues/detail?id=20017
2012-04-02 15:00:03 +08:00