The Android Open Source Project
a1d1abbc26
am 22bd479e
: am e35ae86e
: Reconcile with jb-release
...
* commit '22bd479e2e8454ed726f8c650e52b78702262d34':
2012-07-27 16:24:00 -07:00
Elliott Hughes
c823b2c741
am 616f3680
: am a7916509
: Merge "Fix a TEMP_FAILURE_RETRY usage error in the linker."
...
* commit '616f368076c9d7f0fc4459b79ba26c1d1ec0a247':
Fix a TEMP_FAILURE_RETRY usage error in the linker.
2012-07-27 16:00:36 -07:00
Elliott Hughes
616f368076
am a7916509
: Merge "Fix a TEMP_FAILURE_RETRY usage error in the linker."
...
* commit 'a7916509a3446afd0e863b03e4204cee73e81555':
Fix a TEMP_FAILURE_RETRY usage error in the linker.
2012-07-27 15:58:57 -07:00
Elliott Hughes
d7dfcb0cb0
am 514ace95
: am 9061c6e7
: Merge "Replace ALL_PREBUILTS with BUILD_PREBUILT"
...
* commit '514ace9534233aa7ef5ff3f9d9c614c94eeefc1f':
Replace ALL_PREBUILTS with BUILD_PREBUILT
2012-07-27 15:51:24 -07:00
Elliott Hughes
514ace9534
am 9061c6e7
: Merge "Replace ALL_PREBUILTS with BUILD_PREBUILT"
...
* commit '9061c6e7ae1d9b0e4d2f8a62b3682a565282f9b9':
Replace ALL_PREBUILTS with BUILD_PREBUILT
2012-07-27 15:47:37 -07:00
The Android Open Source Project
22bd479e2e
am e35ae86e
: Reconcile with jb-release
...
* commit 'e35ae86e70b1e728c220867d5a2aa66955c87c34':
2012-07-27 15:45:49 -07:00
Elliott Hughes
a7916509a3
Merge "Fix a TEMP_FAILURE_RETRY usage error in the linker."
2012-07-27 15:43:11 -07:00
Elliott Hughes
8dfc073b14
Fix a TEMP_FAILURE_RETRY usage error in the linker.
...
Similar to the fix in c20d0f3993
.
grep(1) says this was the only other instance in bionic.
Change-Id: I1729038762ee1c7c4743a6bd11d5558afd6f5749
2012-07-27 15:30:51 -07:00
The Android Open Source Project
e35ae86e70
Reconcile with jb-release
...
Change-Id: I89a2498aeb91f29a70f1e100c41f03cf41a2e49e
2012-07-27 14:49:51 -07:00
Elliott Hughes
9061c6e7ae
Merge "Replace ALL_PREBUILTS with BUILD_PREBUILT"
2012-07-27 14:14:41 -07:00
Ying Wang
6171d11e72
Replace ALL_PREBUILTS with BUILD_PREBUILT
...
(cherry-picked from 186b36b65bdfbf2c89a661539bf530359364eac9.)
Bug: 6857263
Change-Id: If787d84415dd2ac07105fe0d0b7a27c9be75df64
2012-07-27 13:44:01 -07:00
Elliott Hughes
cb9ea8873a
am 408e3e50
: am 45038ae4
: am 12f411d9
: Merge "Correction to use of TEMP_FAILURE_RETRY in send_prop_msg"
...
* commit '408e3e5046ed030c464cdae6c95bc6a9d6de39cc':
Correction to use of TEMP_FAILURE_RETRY in send_prop_msg
2012-07-27 10:21:45 -07:00
Elliott Hughes
408e3e5046
am 45038ae4
: am 12f411d9
: Merge "Correction to use of TEMP_FAILURE_RETRY in send_prop_msg"
...
* commit '45038ae483313a5cc445a90fb0499d4c6ad69b1d':
Correction to use of TEMP_FAILURE_RETRY in send_prop_msg
2012-07-27 10:16:50 -07:00
Elliott Hughes
45038ae483
am 12f411d9
: Merge "Correction to use of TEMP_FAILURE_RETRY in send_prop_msg"
...
* commit '12f411d9a696ca7a0fe490fb530a9accbda66a99':
Correction to use of TEMP_FAILURE_RETRY in send_prop_msg
2012-07-27 10:14:50 -07:00
Elliott Hughes
12f411d9a6
Merge "Correction to use of TEMP_FAILURE_RETRY in send_prop_msg"
2012-07-27 10:02:59 -07:00
Jens Gulin
c20d0f3993
Correction to use of TEMP_FAILURE_RETRY in send_prop_msg
...
RETRY macro may retry command if result is -1. In this
case the command was "connect < 0" instead of just
connect. The comparison will not return -1 and thus
retry is never done. This is now corrected so that
interrupts will cause retry instead of fail.
(There was no other negative side effect of the bug.
The result code from RETRY was used in an if-statement
and it would be true for all negative connect results.
This was according to expectations.)
Change-Id: Ie206b39878e9befea4e3be9a4061ee39eb232d80
2012-07-27 15:18:23 +02:00
Peter Enderborg
3460db9490
bionic: Stack pointer/signal race condition.
...
Move the stackpointer so a captured signal does not corrupt
stack variables needed for __thread_entry.
Change-Id: I3e1e7b94a6d7cd3a07081f849043262743aa8064
2012-07-27 15:11:01 +02:00
Elliott Hughes
6320848df6
am c636ff19
: am 9a9ca7c1
: am 7d6c3f70
: Merge "Remove the \'Factory\' time zone by not processing the \'factory\' file."
...
* commit 'c636ff1944ca9c67953e3162ba7a8c39e44fff42':
Remove the 'Factory' time zone by not processing the 'factory' file.
2012-07-26 22:56:12 -07:00
Elliott Hughes
c636ff1944
am 9a9ca7c1
: am 7d6c3f70
: Merge "Remove the \'Factory\' time zone by not processing the \'factory\' file."
...
* commit '9a9ca7c1e8079aaae6b1833bd06719e98ca0783e':
Remove the 'Factory' time zone by not processing the 'factory' file.
2012-07-26 22:34:57 -07:00
Elliott Hughes
9a9ca7c1e8
am 7d6c3f70
: Merge "Remove the \'Factory\' time zone by not processing the \'factory\' file."
...
* commit '7d6c3f700b8089d31a33ba0f9f6eed9407724d0d':
Remove the 'Factory' time zone by not processing the 'factory' file.
2012-07-26 17:44:38 -07:00
Elliott Hughes
7d6c3f700b
Merge "Remove the 'Factory' time zone by not processing the 'factory' file."
2012-07-26 17:36:21 -07:00
Elliott Hughes
541c225320
Remove the 'Factory' time zone by not processing the 'factory' file.
...
The factory file (and Factory time zone) was meant as a way to say
"not configured" that would give a clear error when running date(1).
For us it would just look like UTC, so it is of no value.
Bug: 2997381
Change-Id: I1a4b85dce97d1d9370b22ba79e8fe5dafff56541
2012-07-26 16:19:46 -07:00
Ying Wang
186b36b65b
Replace ALL_PREBUILTS with BUILD_PREBUILT
...
Bug: 6857263
Change-Id: Ib639f1c4d572fec088298f95f6d5a2951d56cd12
2012-07-26 15:55:34 -07:00
Nick Kralevich
68c1f682ff
am b4fc64c9
: am cc5edd83
: Merge "vfprintf: fix spelling."
...
* commit 'b4fc64c96cad1be63b5c52af835c4a93b0e60204':
vfprintf: fix spelling.
2012-07-25 22:26:13 -07:00
Nick Kralevich
b4fc64c96c
am cc5edd83
: Merge "vfprintf: fix spelling."
...
* commit 'cc5edd83ec0303ceb682c563073d98f8a592737d':
vfprintf: fix spelling.
2012-07-25 22:22:20 -07:00
Nick Kralevich
cc5edd83ec
Merge "vfprintf: fix spelling."
2012-07-25 16:09:34 -07:00
Nick Kralevich
9145ad3f0a
vfprintf: fix spelling.
...
Change-Id: I6dc611143fb1f3e9ccf0a77b40ee48a3c1d72ca9
2012-07-25 16:01:38 -07:00
The Android Automerger
a501f6c7e3
merge in jb-release history after reset to jb-dev
2012-07-24 20:23:07 -07:00
Elliott Hughes
edc5fe530f
am 9dbd4c06
: am c27103d8
: Merge "[MIPS] Use an aligned address to provoke SIGSEGV in abort()"
...
* commit '9dbd4c06fe143a4187d2d8d418c1a3b7c1ed39ba':
[MIPS] Use an aligned address to provoke SIGSEGV in abort()
2012-07-24 18:05:28 -07:00
Elliott Hughes
7c3323516b
am 860dc7e2
: am c98e2365
: Merge "Fix implementation of generic atomic operations"
...
* commit '860dc7e25d4ba64b5bd49fe123bae6e6105dd2e7':
Fix implementation of generic atomic operations
2012-07-24 18:05:27 -07:00
Elliott Hughes
9dbd4c06fe
am c27103d8
: Merge "[MIPS] Use an aligned address to provoke SIGSEGV in abort()"
...
* commit 'c27103d84c124d40f3f4cff46d7cfa74342e0585':
[MIPS] Use an aligned address to provoke SIGSEGV in abort()
2012-07-24 18:03:22 -07:00
Elliott Hughes
860dc7e25d
am c98e2365
: Merge "Fix implementation of generic atomic operations"
...
* commit 'c98e2365cdd0c2330711118b689171df143f6399':
Fix implementation of generic atomic operations
2012-07-24 18:03:12 -07:00
Elliott Hughes
c27103d84c
Merge "[MIPS] Use an aligned address to provoke SIGSEGV in abort()"
2012-07-24 17:42:51 -07:00
Chris Dearman
00a66a6fe8
[MIPS] Use an aligned address to provoke SIGSEGV in abort()
...
Change-Id: I269c9ccc07058773fb0f9d70673673157ab38f6a
2012-07-24 17:42:06 -07:00
Elliott Hughes
c98e2365cd
Merge "Fix implementation of generic atomic operations"
2012-07-24 17:21:47 -07:00
Chris Dearman
958dad705a
Fix implementation of generic atomic operations
...
Change-Id: Ie1ea5aacc561e2d6d40125d2952ed0e9116b7b0d
2012-07-24 13:56:38 -07:00
Elliott Hughes
0b82e1bd77
am d33ce20e
: am 344aca8c
: Merge "[MIPS] Add atomic routines"
...
* commit 'd33ce20e6dfbe5be081867c9ace538022991bb10':
[MIPS] Add atomic routines
2012-07-24 13:53:37 -07:00
Elliott Hughes
d33ce20e6d
am 344aca8c
: Merge "[MIPS] Add atomic routines"
...
* commit '344aca8ced2522074f799439e201226377d02dba':
[MIPS] Add atomic routines
2012-07-24 13:51:10 -07:00
Elliott Hughes
344aca8ced
Merge "[MIPS] Add atomic routines"
2012-07-24 13:41:06 -07:00
Raghu Gandham
f7fb9e1ef1
[MIPS] Add atomic routines
...
Change-Id: I2cb20ce44dd230d222b7fc1ede2e1e3dce6e692b
2012-07-24 10:30:22 -07:00
Elliott Hughes
7cfe2c5c07
am 5e2a2705
: am b109e437
: Merge "Upgrade to tzdata2012d."
...
* commit '5e2a2705f237130bc516b62ff1372e94ad508f12':
Upgrade to tzdata2012d.
2012-07-23 19:04:50 -07:00
Elliott Hughes
5e2a2705f2
am b109e437
: Merge "Upgrade to tzdata2012d."
...
* commit 'b109e437fcbc1cbe09fce8ce2abb6f951d5a0274':
Upgrade to tzdata2012d.
2012-07-21 14:20:17 -07:00
Elliott Hughes
b109e437fc
Merge "Upgrade to tzdata2012d."
2012-07-21 14:09:24 -07:00
Elliott Hughes
5d967e43d0
Upgrade to tzdata2012d.
...
This upgrade involved rewriting the script; the data has moved to ftp.iana.org,
where it's slightly less convenient to access, so it's time to use something
that can talk FTP...
As for tzdata2012d, it's just updating Morocco for this weekend's changes, now
they've been decided at the last minute (as usual).
Change-Id: I772df57a6e09b3bf3d9541bfc08930d6f18633b4
2012-07-20 16:53:32 -07:00
Elliott Hughes
acda32c8f2
am a94c708a
: am 654b1501
: Merge "Update time.h for CLOCK_BOOTTIME."
...
* commit 'a94c708a15713535c0ece63ffc43d016eccfebe1':
Update time.h for CLOCK_BOOTTIME.
2012-07-20 10:00:47 -07:00
Naseer Ahmed
2730674ca9
bionic: Update MDP and rotator headers
...
Change-Id: I585e07b004dfa6b5113050211ca67e4c057f5531
2012-07-20 08:54:32 -07:00
Elliott Hughes
a94c708a15
am 654b1501
: Merge "Update time.h for CLOCK_BOOTTIME."
...
* commit '654b1501f7a936034d07f579c3d4a15d1319dac2':
Update time.h for CLOCK_BOOTTIME.
2012-07-19 17:37:33 -07:00
Elliott Hughes
654b1501f7
Merge "Update time.h for CLOCK_BOOTTIME."
2012-07-19 17:18:37 -07:00
Nick Pelly
0351955a68
Update time.h for CLOCK_BOOTTIME.
...
(cherry-pick of 8958a38329
)
Change-Id: Ie8de6b32fa81566db53ad7e9fd4b197f4cede628
2012-07-19 17:10:14 -07:00
Nick Pelly
8958a38329
Update time.h for CLOCK_BOOTTIME.
...
Change-Id: Iafbc6a2f57587feb68526e4eab67452aa0db5311
2012-07-19 16:33:58 -07:00