Brad Fitzpatrick
38e53adadd
am c59b2482
: am 5a6f593b
: Merge "Use sigemptyset to initialise sigset_t values. sigset_t may not be implemented as an integral type."
...
* commit 'c59b248241b18492d20e112230a907c14400275b':
Use sigemptyset to initialise sigset_t values. sigset_t may not be implemented as an integral type.
2011-03-16 11:43:29 -07:00
Brad Fitzpatrick
c59b248241
am 5a6f593b
: Merge "Use sigemptyset to initialise sigset_t values. sigset_t may not be implemented as an integral type."
...
* commit '5a6f593b6197b96f980d9d45f9a981ef8705caf4':
Use sigemptyset to initialise sigset_t values. sigset_t may not be implemented as an integral type.
2011-03-16 11:41:24 -07:00
Brad Fitzpatrick
5a6f593b61
Merge "Use sigemptyset to initialise sigset_t values. sigset_t may not be implemented as an integral type."
2011-03-16 11:15:37 -07:00
satok
a995ca7215
am 621bc533
: (-s ours) am 0b3c5c50
: do not merge. Move property setting from libcutils to bionic.
...
* commit '621bc53339c10e86d92ec89eefbb16af33229774':
do not merge. Move property setting from libcutils to bionic.
2011-03-15 23:26:55 -07:00
satok
621bc53339
am 0b3c5c50
: do not merge. Move property setting from libcutils to bionic.
...
* commit '0b3c5c50f7bed92282783995bf6a7cc777fa9392':
do not merge. Move property setting from libcutils to bionic.
2011-03-15 23:23:56 -07:00
satok
0b3c5c50f7
do not merge. Move property setting from libcutils to bionic.
...
Backport I110b653a58f3
All the other property stuff is already here. Property setting was
only in libcutils previously to leverage a utility function / constant
or two.
Unfortunately in the process of fixing a race condition we would've
had to do break abstraction boundaries and put some libc-internal
details into libcutils so instead of that we'll just move this
into bionic.
Along with Iee1ca9b7, this now passes:
$ adb shell am instrument -w -e class android.os.SystemPropertiesTest \
com.android.frameworks.coretests.systemproperties/android.test.InstrumentationTestRunner
Bug: 3511230
Change-Id: I1b588db3344169621e1279ecc0b660cf4e1015d7
2011-03-15 23:06:58 -07:00
Mike Lockwood
b2eddeccf6
am 9c0d6616
: (-s ours) am c8fe4add
: (-s ours) am 3f14ff34
: DO NOT MERGE: Update USB accessory kernel header to include serial number support
...
* commit '9c0d66161c1af06844385c859480aab5762a767f':
DO NOT MERGE: Update USB accessory kernel header to include serial number support
2011-03-15 15:47:37 -07:00
Mike Lockwood
9c0d66161c
am c8fe4add
: (-s ours) am 3f14ff34
: DO NOT MERGE: Update USB accessory kernel header to include serial number support
...
* commit 'c8fe4add6d96bf982b63b382417942a9d58f847b':
DO NOT MERGE: Update USB accessory kernel header to include serial number support
2011-03-15 15:43:54 -07:00
Mike Lockwood
c8fe4add6d
am 3f14ff34
: DO NOT MERGE: Update USB accessory kernel header to include serial number support
...
* commit '3f14ff34dfbd00fcffb18b10a1a3e17e2cc5ebdf':
DO NOT MERGE: Update USB accessory kernel header to include serial number support
2011-03-15 14:49:22 -07:00
satok
c0f4a09658
am aa00ec1a
: (-s ours) am ec7e8cc9
: (-s ours) do not merge. Move property setting from libcutils to bionic.
...
* commit 'aa00ec1a2c6fa2bc06bfa16759d99e17a1d0b9b7':
do not merge. Move property setting from libcutils to bionic.
2011-03-14 22:53:13 -07:00
satok
aa00ec1a2c
am ec7e8cc9
: (-s ours) do not merge. Move property setting from libcutils to bionic.
...
* commit 'ec7e8cc9dddafc624cd28939c1a38ea336c89455':
do not merge. Move property setting from libcutils to bionic.
2011-03-14 22:47:16 -07:00
satok
ec7e8cc9dd
do not merge. Move property setting from libcutils to bionic.
...
Backport I110b653a58f3
All the other property stuff is already here. Property setting was
only in libcutils previously to leverage a utility function / constant
or two.
Unfortunately in the process of fixing a race condition we would've
had to do break abstraction boundaries and put some libc-internal
details into libcutils so instead of that we'll just move this
into bionic.
Along with Iee1ca9b7, this now passes:
$ adb shell am instrument -w -e class android.os.SystemPropertiesTest \
com.android.frameworks.coretests.systemproperties/android.test.InstrumentationTestRunner
Bug: 3511230
Change-Id: I1b588db3344169621e1279ecc0b660cf4e1015d7
2011-03-15 11:02:26 +09:00
Mike Lockwood
7cfc4fc4f5
am d7321f83
: (-s ours) am 78befc12
: (-s ours) am 6139fa33
: DO NOT MERGE: linux/usb/f_accessory.h: Update USB accessory kernel header
...
* commit 'd7321f833da9543af6bad15d13d97b07e020eab1':
DO NOT MERGE: linux/usb/f_accessory.h: Update USB accessory kernel header
2011-03-14 18:27:39 -07:00
Mike Lockwood
d7321f833d
am 78befc12
: (-s ours) am 6139fa33
: DO NOT MERGE: linux/usb/f_accessory.h: Update USB accessory kernel header
...
* commit '78befc121181a17a1a537575274a35f75267902b':
DO NOT MERGE: linux/usb/f_accessory.h: Update USB accessory kernel header
2011-03-14 18:24:55 -07:00
Mike Lockwood
d1edd7956a
am a7e94422
: am 2bb79ad9
: Update USB accessory kernel header to include serial number support
...
* commit 'a7e9442270aa98e6a58a40a0eb2391d5eadaf6f0':
Update USB accessory kernel header to include serial number support
2011-03-14 17:49:58 -07:00
Mike Lockwood
a7e9442270
am 2bb79ad9
: Update USB accessory kernel header to include serial number support
...
* commit '2bb79ad9b5941ad11b7ccaa8147577cef69524b2':
Update USB accessory kernel header to include serial number support
2011-03-14 17:43:39 -07:00
Brad Fitzpatrick
5dc354bef7
Merge "Move property setting from libcutils to bionic."
2011-03-14 17:09:26 -07:00
Brad Fitzpatrick
4399df8f2e
Move property setting from libcutils to bionic.
...
All the other property stuff is already here. Property setting was
only in libcutils previously to leverage a utility function / constant
or two.
Unfortunately in the process of fixing a race condition we would've
had to do break abstraction boundaries and put some libc-internal
details into libcutils so instead of that we'll just move this
into bionic.
Along with Iee1ca9b7, this now passes:
$ adb shell am instrument -w -e class android.os.SystemPropertiesTest \
com.android.frameworks.coretests.systemproperties/android.test.InstrumentationTestRunner
Bug: 3511230
Change-Id: I110b653a58f312fbe069dca59892a877ae9bc911
2011-03-14 16:53:18 -07:00
Mike Lockwood
3f14ff34df
DO NOT MERGE: Update USB accessory kernel header to include serial number support
...
Change-Id: I61d889b107bd5e052ebac393883b87dac730ea6a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-14 19:16:28 -04:00
Mike Lockwood
2bb79ad9b5
Update USB accessory kernel header to include serial number support
...
Change-Id: Ic94e3f5ad278df43777fc4ea97f1fc67f6ccab0e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-14 17:50:44 -04:00
Iliyan Malchev
368070454b
bionic: remove LOCAL_PRELINK_MODULE
...
Change-Id: Iad65ae18446b20d2aace7b8fe19b1a032b616e9c
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-03-14 14:25:58 -07:00
Elliott Hughes
aa54339415
Merge "Upgrade to tzdata2011d."
2011-03-14 14:14:29 -07:00
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