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
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
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
Andrew Hsieh
7a17a9aff7
Merge "Fixed to #include correct 32-bit headers"
2012-04-01 23:38:27 -07:00
Andrew Hsieh
0523af7ca2
Fixed to #include correct 32-bit headers
...
Corrected for example <asm/io.h> to include io_32.h instead of io_64.h
(which is missing, BTW).
Copied from the results of commit (same title) in bionic.git:
126601dd3f5303b50033dcb88945d928aa764aa4
2012-04-02 14:35:36 +08:00
Tony Chan
7b1dc62ab8
am f26fe680: am 1a2ddb42: sdk doc change: Added KeyChain API Demo
...
* commit 'f26fe680e4a11e67340848ce6509a79924c77b29':
2012-03-31 02:23:51 -07:00
Tony Chan
d426fcd9c2
am a29f43f6: am 1a2ddb42: sdk doc change: Added KeyChain API Demo
...
* commit 'a29f43f6e18ef78e73b64e6f2a0b34908f67fa21':
sdk doc change: Added KeyChain API Demo
2012-03-31 02:20:36 -07:00
Tony Chan
f26fe680e4
am 1a2ddb42: sdk doc change: Added KeyChain API Demo
...
* commit '1a2ddb4216d81f9feadfea3a94bc9923255fe49a':
sdk doc change: Added KeyChain API Demo
2012-03-31 02:18:32 -07:00
Tony Chan
a29f43f6e1
am 1a2ddb42: sdk doc change: Added KeyChain API Demo
...
* commit '1a2ddb4216d81f9feadfea3a94bc9923255fe49a':
sdk doc change: Added KeyChain API Demo
2012-03-31 02:17:44 -07:00
Andrew Hsieh
b7e584c94b
am b002fa5f: am 2c950473: Merge "MIPS platform files for building the NDK"
...
* commit 'b002fa5fc82c71c10ebf1740dc8c83faacc032ef':
MIPS platform files for building the NDK
2012-03-30 22:33:21 -07:00
Andrew Hsieh
844020ace7
am 7512bce0: am 49513bb2: Merge "[MIPS] crt* Object files generated from .S files. The object files are generated with the assembler built from binutils-2.21"
...
* commit '7512bce044a0b8c995026ccc8db22f8f67154439':
[MIPS] crt* Object files generated from .S files. The object files are generated with the assembler built from binutils-2.21
2012-03-30 22:33:20 -07:00
Andrew Hsieh
b002fa5fc8
am 2c950473: Merge "MIPS platform files for building the NDK"
...
* commit '2c9504731b2338b28640a752b94bc8c41299e6cb':
MIPS platform files for building the NDK
2012-03-30 22:31:30 -07:00
Andrew Hsieh
7512bce044
am 49513bb2: Merge "[MIPS] crt* Object files generated from .S files. The object files are generated with the assembler built from binutils-2.21"
...
* commit '49513bb2c3105b43e81e1d6dbace3626750bd1a8':
[MIPS] crt* Object files generated from .S files. The object files are generated with the assembler built from binutils-2.21
2012-03-30 22:31:29 -07:00
Andrew Hsieh
2c9504731b
Merge "MIPS platform files for building the NDK"
2012-03-30 19:10:05 -07:00
Andrew Hsieh
49513bb2c3
Merge "[MIPS] crt* Object files generated from .S files. The object files are generated with the assembler built from binutils-2.21"
2012-03-30 19:07:23 -07:00
Raghu Gandham
22d3d88a7a
[MIPS] crt* Object files generated from .S files.
...
The object files are generated with the assembler
built from binutils-2.21
2012-03-30 18:27:51 -07:00
Chao-Ying Fu
718e73cf26
MIPS platform files for building the NDK
...
Change-Id: If19af75003aeb8872d23d7901f01c434bdc58a5f
2012-03-30 18:09:22 -07:00
Tony Chan
1a2ddb4216
sdk doc change: Added KeyChain API Demo
...
Change-Id: Ib2b751a9de485359705b243d2c70e5f8f2c8ab3c
2012-03-30 11:10:01 +08:00
Andrew Hsieh
9c8dbc6780
am 0e8d9416: am 1a94764c: Merge "ndk: Add MIPS Platform files which contain C runtime headers and sources of crt* assembler files"
...
* commit '0e8d941644d0d71b2999a30069eda8f9cf4e2b88':
ndk: Add MIPS Platform files which contain C runtime headers and sources of crt* assembler files
2012-03-28 23:47:25 -07:00
Andrew Hsieh
0e8d941644
am 1a94764c: Merge "ndk: Add MIPS Platform files which contain C runtime headers and sources of crt* assembler files"
...
* commit '1a94764ca2b8824d797ad3df38c318c6c85008ac':
ndk: Add MIPS Platform files which contain C runtime headers and sources of crt* assembler files
2012-03-28 23:45:24 -07:00
Andrew Hsieh
1a94764ca2
Merge "ndk: Add MIPS Platform files which contain C runtime headers and sources of crt* assembler files"
2012-03-28 18:18:15 -07:00
Raphael Moll
7f45b2e940
am 3f625090: am 75d9cabc: resolved conflicts for merge of fe2da416 to stage-aosp-master
...
* commit '3f6250907c3dd53830e34d54200bbd94845f1f31':
Merge SDK support for source.properties templates.
2012-03-28 11:40:06 -07:00
Raphael Moll
3f6250907c
am 75d9cabc: resolved conflicts for merge of fe2da416 to stage-aosp-master
...
* commit '75d9cabc8e921398561fdb8008ffb50c33592b38':
Merge SDK support for source.properties templates.
2012-03-28 11:38:08 -07:00
Raphael Moll
75d9cabc8e
resolved conflicts for merge of fe2da416 to stage-aosp-master
...
Change-Id: I70924f6d51e2c790314a2f34ae7c33935a72bda6
2012-03-28 11:05:45 -07:00
Raphael Moll
fe2da416d8
Merge "Merge SDK support for source.properties templates."
2012-03-27 19:06:23 -07:00
Raghu Gandham
a8a0638b9e
ndk: Add MIPS Platform files which contain C runtime headers
...
and sources of crt* assembler files
Change-Id: I10547e8b589d36a7937a0833d86d4406a232aa2c
Signed-off-by: Raghu Gandham <raghu@mips.com >
2012-03-27 15:45:08 -07:00
Raphael Moll
f413515f16
Merge SDK support for source.properties templates.
...
Requires build.git change Ib36928097
Change-Id: Ida0c471fe166a1388584f2cf2250e07040ed0e55
2012-03-27 11:59:06 -07:00
Andrew Hsieh
314dea12df
am 58f599f9: am 2038b5ac: am 799fada5: Merge "ndk: Include limits.h in wchar.h as it contains the definitions for INT_MAX and INT_MIN. Without this fix, the following lines will fail when configuring gnu stdlibc++ library. (INT_MAX and INT_MIN are undefined.)"
...
* commit '58f599f9aa3102fa06ca2dc729014cce33b74bbf':
ndk: Include limits.h in wchar.h as it contains the definitions for INT_MAX and INT_MIN. Without this fix, the following lines will fail when configuring gnu stdlibc++ library. (INT_MAX and INT_MIN are undefined.)
2012-03-27 09:42:56 -07:00
Andrew Hsieh
5a0380a06f
am 360a16af: am 47de63df: am 2e71de56: Merge "ndk: <signal.h>: include <asm/sigcontext.h>"
...
* commit '360a16af7edb82dc9ce8f1c2f6fb1e3c8f40f13b':
ndk: <signal.h>: include <asm/sigcontext.h>
2012-03-27 09:42:55 -07:00
Andrew Hsieh
58f599f9aa
am 2038b5ac: am 799fada5: Merge "ndk: Include limits.h in wchar.h as it contains the definitions for INT_MAX and INT_MIN. Without this fix, the following lines will fail when configuring gnu stdlibc++ library. (INT_MAX and INT_MIN are undefined.)"
...
* commit '2038b5acc50b7eb848becb6a03897918669a9dd3':
ndk: Include limits.h in wchar.h as it contains the definitions for INT_MAX and INT_MIN. Without this fix, the following lines will fail when configuring gnu stdlibc++ library. (INT_MAX and INT_MIN are undefined.)
2012-03-27 09:41:22 -07:00
Andrew Hsieh
360a16af7e
am 47de63df: am 2e71de56: Merge "ndk: <signal.h>: include <asm/sigcontext.h>"
...
* commit '47de63df5ca4512cc71467e691193ee0262834be':
ndk: <signal.h>: include <asm/sigcontext.h>
2012-03-27 09:41:21 -07:00