Commit Graph

8559 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Andrew Hsieh
2038b5acc5 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 '799fada598b048b02bf63c0eea9b6d676f9be142':
  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:39:02 -07:00
Andrew Hsieh
47de63df5c am 2e71de56: Merge "ndk: <signal.h>: include <asm/sigcontext.h>"
* commit '2e71de568e54242952726e437fab92508353a33b':
  ndk: <signal.h>: include <asm/sigcontext.h>
2012-03-27 09:39:01 -07:00
Andrew Hsieh
799fada598 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.)" 2012-03-27 04:33:53 -07:00
Andrew Hsieh
2e71de568e Merge "ndk: <signal.h>: include <asm/sigcontext.h>" 2012-03-27 04:31:38 -07:00
Jesse Hall
e824ff28a6 am db9e12c6: am 71aa2fca: Merge "EmuGL: Deliver every frame to a callback"
* commit 'db9e12c671a44f84642d29427633513590516674':
  EmuGL: Deliver every frame to a callback
2012-03-26 18:29:42 -07:00
Jesse Hall
db9e12c671 am 71aa2fca: Merge "EmuGL: Deliver every frame to a callback"
* commit '71aa2fcac1cd1e5d59c210b5dd332ca4aefba530':
  EmuGL: Deliver every frame to a callback
2012-03-26 18:27:10 -07:00
Jesse Hall
71aa2fcac1 Merge "EmuGL: Deliver every frame to a callback" 2012-03-26 15:42:22 -07:00
Jesse Hall
64cec4708d am 64cd8f35: EmuGL: use custom egl.cfg in Google APIs add-on
* commit '64cd8f35fb9cefdeaaded4025af011d1d4c9b90a':
  EmuGL: use custom egl.cfg in Google APIs add-on
2012-03-26 15:34:41 -07:00
Jesse Hall
64cd8f35fb EmuGL: use custom egl.cfg in Google APIs add-on
Change-Id: I30468d668ce72cf3a4de1cace1f8e4f1610b9756
2012-03-26 15:07:00 -07:00