Mike Lockwood
78befc1211
am 6139fa33
: DO NOT MERGE: linux/usb/f_accessory.h: Update USB accessory kernel header
...
* commit '6139fa33ab823e935471fa71bba4c6f715ad6c56':
DO NOT MERGE: linux/usb/f_accessory.h: Update USB accessory kernel header
2011-03-14 13:35:03 -07:00
Chris Dearman
c1519a52ef
Use sigemptyset to initialise sigset_t values.
...
sigset_t may not be implemented as an integral type.
Change-Id: I3f5ec86d6383685979d8d23ef508b6c609569b38
Signed-off-by: Raghu Gandham <raghu@mips.com>
2011-03-14 12:15:22 -07:00
Brad Fitzpatrick
70828ae0ea
am f9316d37
: am 08a4ce98
: am 0c398985
: Merge "[ENDIAN] Build md5 code correctly for bigendian targets"
...
* commit 'f9316d37b462d523438c621f75c47f52a12e4087':
[ENDIAN] Build md5 code correctly for bigendian targets
2011-03-14 12:10:07 -07:00
David 'Digit' Turner
a90a1213da
am 8d1f2e6f
: am 638608b1
: am da8ea213
: Merge "libc: <stdint.h>: Don\'t make __STD_CONSTANT_MACROS available if only __STD_LIMIT_MACROS is defined."
...
* commit '8d1f2e6ffc7230e4000e5352e5798095a1f6d428':
libc: <stdint.h>: Don't make __STD_CONSTANT_MACROS available if only __STD_LIMIT_MACROS is defined.
2011-03-14 12:05:58 -07:00
David 'Digit' Turner
37bec5d740
am 448a1b9f
: am b299039d
: am e6e2ba1d
: Merge "libc: <pthread.h>: Replace \'#if __cplusplus\' by \'#ifdef __cplusplus\'"
...
* commit '448a1b9f1827cbebad69383ba3f09cc0be5b4986':
libc: <pthread.h>: Replace '#if __cplusplus' by '#ifdef __cplusplus'
2011-03-14 12:05:54 -07:00
Brad Fitzpatrick
f9316d37b4
am 08a4ce98
: am 0c398985
: Merge "[ENDIAN] Build md5 code correctly for bigendian targets"
...
* commit '08a4ce983ba14cef394e5198c9561349ec7fef44':
[ENDIAN] Build md5 code correctly for bigendian targets
2011-03-14 11:50:56 -07:00
David 'Digit' Turner
8d1f2e6ffc
am 638608b1
: am da8ea213
: Merge "libc: <stdint.h>: Don\'t make __STD_CONSTANT_MACROS available if only __STD_LIMIT_MACROS is defined."
...
* commit '638608b11afbd255ddbd15e739f0f638791a4305':
libc: <stdint.h>: Don't make __STD_CONSTANT_MACROS available if only __STD_LIMIT_MACROS is defined.
2011-03-14 10:53:11 -07:00
David 'Digit' Turner
448a1b9f18
am b299039d
: am e6e2ba1d
: Merge "libc: <pthread.h>: Replace \'#if __cplusplus\' by \'#ifdef __cplusplus\'"
...
* commit 'b299039d060eb5f523c05e4f9b6934a6b897a54f':
libc: <pthread.h>: Replace '#if __cplusplus' by '#ifdef __cplusplus'
2011-03-14 10:53:09 -07:00
Brad Fitzpatrick
08a4ce983b
am 0c398985
: Merge "[ENDIAN] Build md5 code correctly for bigendian targets"
...
* commit '0c3989854fa3ea3ffb4152c013f68f2a21a52dc1':
[ENDIAN] Build md5 code correctly for bigendian targets
2011-03-14 10:52:05 -07:00
Brad Fitzpatrick
0c3989854f
Merge "[ENDIAN] Build md5 code correctly for bigendian targets"
2011-03-14 10:39:10 -07:00
Elliott Hughes
fe3186b9c1
Upgrade to tzdata2011d.
...
Affects Cuba, Samoa, and Turkey.
Change-Id: Ib1d41c9462ba12995214710f2750888f50fffde5
2011-03-14 10:31:33 -07:00
Mike Lockwood
6139fa33ab
DO NOT MERGE: linux/usb/f_accessory.h: Update USB accessory kernel header
...
For bugs b/4079236, b/4073248 and b/4080288
Change-Id: Id9cdbe95d7dd892bf38e16e7da505ee0eae26b99
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-11 19:02:16 -05:00
David 'Digit' Turner
306641a893
am 3134b56b
: am 0d6bbc7a
: am dfe6eda5
: Merge "libc: <stdint.h>: fix typo in INTMAX_C()/UINTMAX_C() definition"
...
* commit '3134b56bb077d9dce1a8d49ac805878baef33603':
libc: <stdint.h>: fix typo in INTMAX_C()/UINTMAX_C() definition
2011-03-11 15:56:32 -08:00
David 'Digit' Turner
c32c913e5a
am b868a32d
: am 0b73dac8
: am d6722bdd
: Merge "libc: <stdint.h>: Proper C++"
...
* commit 'b868a32df691c5deee1ce2f40878419e3c49d1a3':
libc: <stdint.h>: Proper C++
2011-03-11 15:56:30 -08:00
David 'Digit' Turner
3134b56bb0
am 0d6bbc7a
: am dfe6eda5
: Merge "libc: <stdint.h>: fix typo in INTMAX_C()/UINTMAX_C() definition"
...
* commit '0d6bbc7af091ee05dd032492ae594c263404e4aa':
libc: <stdint.h>: fix typo in INTMAX_C()/UINTMAX_C() definition
2011-03-11 15:40:21 -08:00
David 'Digit' Turner
b868a32df6
am 0b73dac8
: am d6722bdd
: Merge "libc: <stdint.h>: Proper C++"
...
* commit '0b73dac8aa9546c0f532c7ea5e0bf72dd029f271':
libc: <stdint.h>: Proper C++
2011-03-11 15:40:16 -08:00
David 'Digit' Turner
638608b11a
am da8ea213
: Merge "libc: <stdint.h>: Don\'t make __STD_CONSTANT_MACROS available if only __STD_LIMIT_MACROS is defined."
...
* commit 'da8ea213abb8bec08da37622179061630bd8e2f8':
libc: <stdint.h>: Don't make __STD_CONSTANT_MACROS available if only __STD_LIMIT_MACROS is defined.
2011-03-11 11:13:45 -08:00
David 'Digit' Turner
b299039d06
am e6e2ba1d
: Merge "libc: <pthread.h>: Replace \'#if __cplusplus\' by \'#ifdef __cplusplus\'"
...
* commit 'e6e2ba1d40241c85de16d75cbd397cc3670d7535':
libc: <pthread.h>: Replace '#if __cplusplus' by '#ifdef __cplusplus'
2011-03-11 11:12:11 -08:00
David 'Digit' Turner
da8ea213ab
Merge "libc: <stdint.h>: Don't make __STD_CONSTANT_MACROS available if only __STD_LIMIT_MACROS is defined."
2011-03-11 09:32:33 -08:00
David 'Digit' Turner
e6e2ba1d40
Merge "libc: <pthread.h>: Replace '#if __cplusplus' by '#ifdef __cplusplus'"
2011-03-11 09:31:57 -08:00
David 'Digit' Turner
847b183f63
libc: <pthread.h>: Replace '#if __cplusplus' by '#ifdef __cplusplus'
...
See http://code.google.com/p/android/issues/detail?id=15221
Change-Id: Ia7b6668c28737810d6c4941604c6adf232a27c61
2011-03-11 14:51:19 +01:00
David 'Digit' Turner
8b3cea6732
libc: <stdint.h>: Don't make __STD_CONSTANT_MACROS available if only __STD_LIMIT_MACROS is defined.
...
Change-Id: I8b0ea266eab9c6f75d8407b704953ecaef948221
2011-03-11 14:39:05 +01:00
David 'Digit' Turner
0d6bbc7af0
am dfe6eda5
: Merge "libc: <stdint.h>: fix typo in INTMAX_C()/UINTMAX_C() definition"
...
* commit 'dfe6eda57e1e463427f941d5d71f8ccb5297d6d2':
libc: <stdint.h>: fix typo in INTMAX_C()/UINTMAX_C() definition
2011-03-10 12:14:51 -08:00
David 'Digit' Turner
0b73dac8aa
am d6722bdd
: Merge "libc: <stdint.h>: Proper C++"
...
* commit 'd6722bdd201e2747c55ec7255db7f1d5864ccdd3':
libc: <stdint.h>: Proper C++
2011-03-10 12:11:41 -08:00
David 'Digit' Turner
dfe6eda57e
Merge "libc: <stdint.h>: fix typo in INTMAX_C()/UINTMAX_C() definition"
2011-03-10 11:35:58 -08:00
David 'Digit' Turner
0e5411b4ba
libc: <stdint.h>: fix typo in INTMAX_C()/UINTMAX_C() definition
...
Change-Id: I3c74269901a288c448734dd7eb442a62b9348db8
2011-03-10 20:35:17 +01:00
Paul Lind
865e3789dd
[ENDIAN] Build md5 code correctly for bigendian targets
...
Signed-off-by: Raghu Gandham <raghu@mips.com>
2011-03-10 11:13:50 -08:00
David 'Digit' Turner
d6722bdd20
Merge "libc: <stdint.h>: Proper C++"
2011-03-10 11:01:24 -08:00
Chris Dearman
db4bce0549
Use MAP_FIXED when allocating prelinked shared library regions
...
Prelinked libraries must be mapped to a fixed address. MAP_FIXED is ignored
for non-prelinked libraries (si->base==0)
Signed-off-by: Raghu Gandham <raghu@mips.com>
2011-03-10 10:48:14 -08:00
David 'Digit' Turner
08ff1a6474
libc: <stdint.h>: Proper C++
...
This patch prevents the definition of various macros when <stdint.h> is
included from C++. The ISO C99 standard mentions that when this header
is included from a C++ source file, limit and constant related macros
should only be defined when asked explicitely by defining
__STDC_LIMIT_MACROS and __STD_CONSTANT_MACROS, respectively.
The <stdint.h> lacked the proper #ifdef .. #endif blocks for the
following macros:
INTPTR_MIN, INTPTR_MAX, UINTPTR_MAX, PTRDIFF_MIN, PTRDIFF_MAX
INTMAX_MIN, INTMAX_MAX, UINTMAX_MAX,
INPTR_C, UINTPR_C, PTRDIFF_C, INTMAX_C, UINTMAX_C
This is intended to fix http://code.google.com/p/android/issues/detail?id=14380
after we copy this file to development/ndk/platforms/android-3/include/
Change-Id: Ia77e0822edfaaf568ea599d7de673b310eeeaa4a
2011-03-10 18:02:01 +01:00
Mike Lockwood
00588f13d8
am 1a0775f1
: am c0fc678e
: linux/usb/f_accessory.h: Update USB accessory kernel header
...
* commit '1a0775f1ca5ed1ef9142be5d8239dc6cc500a46f':
linux/usb/f_accessory.h: Update USB accessory kernel header
2011-03-10 07:57:17 -08:00
Mike Lockwood
1a0775f1ca
am c0fc678e
: linux/usb/f_accessory.h: Update USB accessory kernel header
...
* commit 'c0fc678e969885cf95d2dacaad647cdc3f704f6e':
linux/usb/f_accessory.h: Update USB accessory kernel header
2011-03-10 07:52:33 -08:00
David 'Digit' Turner
dcf5164daa
am 81d79f9f
: am 962dcb22
: am fed58049
: Merge "libc: Fix PTHREAD_RWLOCK_INITIALIZER"
...
* commit '81d79f9fb38d9ae8a5711f5774aa5a1516f6cc26':
libc: Fix PTHREAD_RWLOCK_INITIALIZER
Proxy getnameinfo through netd
Updated gcc 4.4.3 IA toolchain doesn't require the .ctors list
Convert cname lenght before use
2011-03-10 01:59:42 -08:00
David 'Digit' Turner
81d79f9fb3
am 962dcb22
: am fed58049
: Merge "libc: Fix PTHREAD_RWLOCK_INITIALIZER"
...
* commit '962dcb22218a1a6d4ebd05e4fc4a69875d037234':
libc: Fix PTHREAD_RWLOCK_INITIALIZER
Proxy getnameinfo through netd
Updated gcc 4.4.3 IA toolchain doesn't require the .ctors list
Convert cname lenght before use
2011-03-10 01:55:35 -08:00
David 'Digit' Turner
962dcb2221
am fed58049
: Merge "libc: Fix PTHREAD_RWLOCK_INITIALIZER"
...
* commit 'fed58049d50083e4c960d89f4bbd516a181c2d18':
libc: Fix PTHREAD_RWLOCK_INITIALIZER
Proxy getnameinfo through netd
Updated gcc 4.4.3 IA toolchain doesn't require the .ctors list
Convert cname lenght before use
2011-03-10 01:51:19 -08:00
David 'Digit' Turner
fed58049d5
Merge "libc: Fix PTHREAD_RWLOCK_INITIALIZER"
2011-03-10 01:26:26 -08:00
David 'Digit' Turner
ca4462d76c
libc: Fix PTHREAD_RWLOCK_INITIALIZER
...
The macro definition was incorrect and resulted in a compile error
when used.
Fixes http://code.google.com/p/android/issues/detail?id=15306
Change-Id: I8fa6047b63e7f56b53653774327099822c469cd1
2011-03-10 10:23:44 +01:00
Mike Lockwood
c0fc678e96
linux/usb/f_accessory.h: Update USB accessory kernel header
...
For bugs b/4079236, b/4073248 and b/4080288
Change-Id: I641a0fa93492c7059900f0193c722356d13eeab5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-09 21:57:00 -05:00
Mike Lockwood
b2dd464951
am b6a562e3
: (-s ours) am 2703b704
: (-s ours) am 6bd73ed4
: Add linux/usb/f_accessory.h header for USB accessory driver DO NOT MERGE
...
* commit 'b6a562e3895c51741748e90d56d822b0a9d36710':
Add linux/usb/f_accessory.h header for USB accessory driver DO NOT MERGE
2011-03-09 14:09:34 -08:00
Mike Lockwood
b6a562e389
am 2703b704
: (-s ours) am 6bd73ed4
: Add linux/usb/f_accessory.h header for USB accessory driver DO NOT MERGE
...
* commit '2703b7046cebfadee325500d957501afbba11ebc':
Add linux/usb/f_accessory.h header for USB accessory driver DO NOT MERGE
2011-03-09 14:05:42 -08:00
Mike Lockwood
2703b7046c
am 6bd73ed4
: Add linux/usb/f_accessory.h header for USB accessory driver DO NOT MERGE
...
* commit '6bd73ed417c52ed57d5f62ea9988b6071a1efbeb':
Add linux/usb/f_accessory.h header for USB accessory driver DO NOT MERGE
2011-03-09 13:31:58 -08:00
Brian Carlstrom
3c2a9aec91
Merge commit 'a08eb1df005189fdf5881b0f7b2f9258a97fec00' into honeycomb-mr1-release-to-dalvik-dev
2011-03-07 13:34:00 -08:00
Elliott Hughes
8d26fbb24a
Upgrade to tzdata2011c.
...
Affects Chile and Annette Island, Alaska.
Change-Id: Ie4985a69e803bbc7ccd30619799ee5a9fd3737ce
2011-03-07 11:54:12 -08:00
Jason Chen
a08eb1df00
am 0ca21df5
: (-s ours) am 6519756b
: Merge "DO NOT MERGE Cherry-pick of 0ee092fb2
from master" into honeycomb
...
* commit '0ca21df5c6fbb22498cfde93b4fd4cac3235901b':
DO NOT MERGE Cherry-pick of 0ee092fb2
from master
2011-03-02 15:32:53 -08:00
Sriram Raman
d381573876
Merge commit '44892440582ee8df1dcace7167e587fdfe1ada6d' into HEAD
2011-03-01 22:36:18 -05:00
Jason Chen
0ca21df5c6
am 6519756b
: Merge "DO NOT MERGE Cherry-pick of 0ee092fb2
from master" into honeycomb
...
* commit '6519756b23a8b18d06dae53cc3ece32c87146972':
DO NOT MERGE Cherry-pick of 0ee092fb2
from master
2011-03-01 17:51:49 -08:00
Jason Chen
6519756b23
Merge "DO NOT MERGE Cherry-pick of 0ee092fb2
from master" into honeycomb
2011-03-01 17:48:25 -08:00
Mattias Falk
4489244058
DO NOT MERGE Cherry-pick of 0ee092fb2
from master
...
Convert cname lenght before use
The length of the cname is sent in big-endian
order. Thus, it has to be converted before used
in android_getaddrinfo_proxy
Change-Id: I78552d427ef6500d9121fc83423f0744ea0c3087
2011-03-01 17:22:04 -08:00
Erik Gilling
da14b0e1dd
add linux/nvhdcp.h header
...
Change-Id: I74a1cf90bc9807002869aa9c7b5eddb065638db2
2011-03-01 14:46:11 -08:00
Mattias Falk
0ee092fb23
Convert cname lenght before use
...
The length of the cname is sent in big-endian
order. Thus, it has to be converted before used
in android_getaddrinfo_proxy
Change-Id: I1a0cc12780c47f7493fcf06f690515829f88c01e
2011-03-01 12:52:10 -08:00