Commit Graph

9444 Commits

Author SHA1 Message Date
Andrew Hsieh
45d8a3b77c am b907051f: (-s ours) am 708a75ba: am ad05e868: Merge "ndk: Fix <sys/atomics.h> declarations."
* commit 'b907051f108b7c0a75845c49bb2e540ecc36fcb4':
  ndk: Fix <sys/atomics.h> declarations.
2012-04-02 08:37:37 -07:00
Andrew Hsieh
c64973f7bc am 95b9de91: am 0480b898: am 26f8b539: Merge "ndk: minor update to <netinet/...> headers."
* commit '95b9de9149d78146c99e06d2e7c75b723a2c8899':
  ndk: minor update to <netinet/...> headers.
2012-04-02 08:00:29 -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
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
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
Andrew Hsieh
ccb5511069 am 672ab2a3: am 15b930a3: am a9adb11a: Merge "ndk: disable logs in release builds of native_app_glue library."
* commit '672ab2a395cab392e5781d0551df8ae485db0f4a':
  ndk: disable logs in release builds of native_app_glue library.
2012-04-02 00:46:00 -07:00
Andrew Hsieh
40c9182f84 am 3e5127ef: am 7ea377d2: am ac1d40cf: Merge "Fixed inconsistent minSdkVersion and target= in NDK samples"
* commit '3e5127efe4979645ac43b841caecba8187a8d431':
  Fixed inconsistent minSdkVersion and target= in NDK samples
2012-04-02 00:45:59 -07:00
Andrew Hsieh
53e47ee6d3 am 4ab5bd9d: am 0117043e: am 7a17a9af: Merge "Fixed to #include correct 32-bit headers"
* commit '4ab5bd9deb1f34d5ceda6d2385808043a4720838':
  Fixed to #include correct 32-bit headers
2012-04-02 00:45:58 -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
ef1e085461 am 7b1dc62a: am f26fe680: am 1a2ddb42: sdk doc change: Added KeyChain API Demo
* commit '7b1dc62ab8b8a085238b809b295a352015834e9a':
2012-03-31 02:25:53 -07: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
8346f695d1 am d426fcd9: am a29f43f6: am 1a2ddb42: sdk doc change: Added KeyChain API Demo
* commit 'd426fcd9c2df2643b61c0627a41afbe453c9faf4':
  sdk doc change: Added KeyChain API Demo
2012-03-31 02:23:12 -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
08f4a2848e am b7e584c9: am b002fa5f: am 2c950473: Merge "MIPS platform files for building the NDK"
* commit 'b7e584c94b23aab20377660eea7f9fd062321c7a':
  MIPS platform files for building the NDK
2012-03-30 22:35:22 -07:00
Andrew Hsieh
eb112748e2 am 844020ac: 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 '844020ace77515e55a6dc7a09e17c1a90f4178ac':
  [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:35:21 -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