The Android Automerger
248321bb6f
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-02 07:41:45 -07:00
The Android Automerger
617a5ee417
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-01 07:10:06 -07:00
Shih-wei Liao
4f13bdd45c
am 7565d5b1
: am 0ca9d074
: Merge "Had include/arm/fenv.h, but missed include/mips/fenv.h."
...
* commit '7565d5b118420cc0dff2d59cf3542e99f415601a':
Had include/arm/fenv.h, but missed include/mips/fenv.h.
2012-07-31 21:02:52 -07:00
Shih-wei Liao
7565d5b118
am 0ca9d074
: Merge "Had include/arm/fenv.h, but missed include/mips/fenv.h."
...
* commit '0ca9d0748e3229c849e3ee17259e0e55d7214800':
Had include/arm/fenv.h, but missed include/mips/fenv.h.
2012-07-31 21:00:39 -07:00
Shih-wei Liao
0ca9d0748e
Merge "Had include/arm/fenv.h, but missed include/mips/fenv.h."
2012-07-31 20:54:18 -07:00
Elliott Hughes
81f1617a68
am 8d2c5b24
: am b910b6f8
: Merge "Updated the cleaned header file mman.h for MIPS."
...
* commit '8d2c5b247e701f51ce3d750e9ee3ff37009630c3':
Updated the cleaned header file mman.h for MIPS.
2012-07-31 15:32:45 -07:00
Elliott Hughes
8d2c5b247e
am b910b6f8
: Merge "Updated the cleaned header file mman.h for MIPS."
...
* commit 'b910b6f8dee14e379664635f4cd7343b3acc7b27':
Updated the cleaned header file mman.h for MIPS.
2012-07-31 15:31:53 -07:00
Elliott Hughes
b910b6f8de
Merge "Updated the cleaned header file mman.h for MIPS."
2012-07-31 15:16:07 -07:00
Raghu Gandham
c29f295d39
Updated the cleaned header file mman.h for MIPS.
...
Change-Id: I8b3734e535711ca07fbf4066e6d967d1ce0f30eb
2012-07-31 14:47:51 -07:00
Elliott Hughes
f19979710a
am 7645355e
: am a513f70b
: Merge "bionic: Stack pointer/signal race condition."
...
* commit '7645355ecdf29301bdc65f9ea8e00c20e51da3f5':
bionic: Stack pointer/signal race condition.
2012-07-31 10:40:06 -07:00
Elliott Hughes
b78aa53904
am bf397b60
: am 21372896
: Merge "fix __cxa_finalize() implementation to be thread safe."
...
* commit 'bf397b601189f8a63c8a842e16af5ed004ef75f5':
fix __cxa_finalize() implementation to be thread safe.
2012-07-31 10:40:05 -07:00
Elliott Hughes
7645355ecd
am a513f70b
: Merge "bionic: Stack pointer/signal race condition."
...
* commit 'a513f70b43e75136145d756388b50028ac4fc4b8':
bionic: Stack pointer/signal race condition.
2012-07-31 10:38:26 -07:00
Elliott Hughes
bf397b6011
am 21372896
: Merge "fix __cxa_finalize() implementation to be thread safe."
...
* commit '21372896ea0f13938c130c8c82cdc3a6b9ccd297':
fix __cxa_finalize() implementation to be thread safe.
2012-07-31 10:38:25 -07:00
Elliott Hughes
a513f70b43
Merge "bionic: Stack pointer/signal race condition."
2012-07-31 10:32:59 -07:00
Elliott Hughes
21372896ea
Merge "fix __cxa_finalize() implementation to be thread safe."
2012-07-31 10:31:20 -07:00
The Android Automerger
15e0ca8186
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-07-31 07:35:13 -07:00
Srinavasa Nagaraju
2270dfa0c4
fix __cxa_finalize() implementation to be thread safe.
...
__cxa_finalize() modifies the access permissions of __atexit
global variable without acquiring _ATEXIT_LOCK(). Fix it prevent
any possible races.
Change-Id: I11939d0ebcbf6f360c14163222d40a449d96948e
2012-07-31 12:30:28 +02:00
Shih-wei Liao
4e86ebb4b6
Had include/arm/fenv.h, but missed include/mips/fenv.h.
...
Needed for the device-build for LLVM's constant folding pass.
Change-Id: I412a98d52458231650801a8b59fe3159a789b8b9
Author: fu@mips.com
2012-07-30 20:12:46 -07:00
Shih-wei Liao
0c2d318837
am 18421669
: am 1ee6e3b7
: Merge "Install crt(begin|end)_so.o to target library path."
...
* commit '184216696a9945a5bf6cb186b4d3a42ffe582818':
Install crt(begin|end)_so.o to target library path.
2012-07-30 13:13:26 -07:00
Shih-wei Liao
184216696a
am 1ee6e3b7
: Merge "Install crt(begin|end)_so.o to target library path."
...
* commit '1ee6e3b7370b36ac72a14c0e31c34963b1bdbbb2':
Install crt(begin|end)_so.o to target library path.
2012-07-30 13:10:11 -07:00
Shih-wei Liao
1ee6e3b737
Merge "Install crt(begin|end)_so.o to target library path."
2012-07-30 12:44:58 -07:00
Ed Heyl
e5b635c885
am 681ccffb
: Merge jb-dev-mako plus fixes to libc/kernel/common/linux/fb.h
...
* commit '681ccffb4593875a3bcc2c17da9713a1215232d9':
bionic: Update MDP and rotator headers
Adding msm_dsps.h header
Update msm headers for audio, camera, ion, charm, rmnet
bionic: Update msm_mdp.h from the kernel
update linux/fb.h to support fb ioctl in kernel 3.4
Use sanitized video decode/encode header files
bionic: Update MDP and KGSL headers
add processed sound/tlv.h header
add processed genlock.h for qualcomm
2012-07-29 22:40:26 -07:00
Ed Heyl
681ccffb45
Merge jb-dev-mako plus fixes to libc/kernel/common/linux/fb.h
...
Change-Id: I1fbe64653db7b8e9bfc6e10fa42deb295aa15a09
2012-07-29 08:22:16 -07:00
Shih-wei Liao
fc0725ec5c
Install crt(begin|end)_so.o to target library path.
...
BUG=6886348.
Change-Id: I176b2c4963d9731b06d10d4e0b92c010a0006b59
2012-07-28 00:33:28 -07:00
Elliott Hughes
b7dd54f0c7
am d6c3369c
: am 7a450b4d
: am 643e5722
: Merge "Report errors to the log, not just stderr."
...
* commit 'd6c3369cec68de60dec0d9ab7469457d817539e1':
Report errors to the log, not just stderr.
2012-07-27 18:32:56 -07:00
Elliott Hughes
d6c3369cec
am 7a450b4d
: am 643e5722
: Merge "Report errors to the log, not just stderr."
...
* commit '7a450b4d9efc5457a987f5b5665ca7c6e7f57e34':
Report errors to the log, not just stderr.
2012-07-27 18:30:04 -07:00
Elliott Hughes
7a450b4d9e
am 643e5722
: Merge "Report errors to the log, not just stderr."
...
* commit '643e5722338d303c0b5aac41107432d8fde4081c':
Report errors to the log, not just stderr.
2012-07-27 18:28:11 -07:00
Elliott Hughes
643e572233
Merge "Report errors to the log, not just stderr."
2012-07-27 18:16:17 -07:00
Elliott Hughes
52d6233296
Report errors to the log, not just stderr.
...
In particular this affects assert(3) and __cxa_pure_virtual, both of
which have managed to confuse people this week by apparently aborting
without reason. (Because stderr goes nowhere, normally.)
Bug: 6852995
Bug: 6840813
Change-Id: I7f5d17d5ddda439e217b7932096702dc013b9142
2012-07-27 17:43:38 -07:00
Elliott Hughes
65b48f892e
am c823b2c7
: am 616f3680
: am a7916509
: Merge "Fix a TEMP_FAILURE_RETRY usage error in the linker."
...
* commit 'c823b2c74137230fc1a166527b5141e3a6bacd65':
Fix a TEMP_FAILURE_RETRY usage error in the linker.
2012-07-27 16:25:03 -07:00
Elliott Hughes
2eb46df63a
am d7dfcb0c
: am 514ace95
: am 9061c6e7
: Merge "Replace ALL_PREBUILTS with BUILD_PREBUILT"
...
* commit 'd7dfcb0cb07bc1bb2b716075697f86de1b4d8e54':
Replace ALL_PREBUILTS with BUILD_PREBUILT
2012-07-27 16:24:50 -07:00
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