OSDN Git Service
Elliott Hughes [Thu, 9 Aug 2012 23:39:15 +0000 (16:39 -0700)]
am
0836a7ff: Merge "Auto-generate a complete NOTICE file."
* commit '
0836a7ffb13890558fe568119b023007cce66373':
Auto-generate a complete NOTICE file.
Elliott Hughes [Thu, 9 Aug 2012 23:25:19 +0000 (16:25 -0700)]
Merge "Auto-generate a complete NOTICE file."
Elliott Hughes [Thu, 9 Aug 2012 22:17:46 +0000 (15:17 -0700)]
Auto-generate a complete NOTICE file.
Remove the hand-collated ones, and switch to a script that pulls the
copyright headers out of every file and collects the unique ones.
Change-Id: Ied3b98b3f56241df97166c410ff81de4e0157c9d
Elliott Hughes [Thu, 9 Aug 2012 21:46:00 +0000 (14:46 -0700)]
am
709bb0f7: Merge "Remove ThirdPartyProject.prop."
* commit '
709bb0f79ced522e5fb145182472ee4063b85368':
Remove ThirdPartyProject.prop.
Elliott Hughes [Thu, 9 Aug 2012 21:31:27 +0000 (14:31 -0700)]
Merge "Remove ThirdPartyProject.prop."
Elliott Hughes [Thu, 9 Aug 2012 21:29:23 +0000 (14:29 -0700)]
Remove ThirdPartyProject.prop.
These are dead. I cleaned up external/ a long time ago, but didn't
realize there were any in the main tree.
Change-Id: I5f35b2da132558e2763164285eb38629cd68ffda
Elliott Hughes [Thu, 9 Aug 2012 19:08:53 +0000 (12:08 -0700)]
am
a17b85d9: Merge "Remove the last .jam file."
* commit '
a17b85d97b16583ba922a88346cc54976a0bfa28':
Remove the last .jam file.
Elliott Hughes [Thu, 9 Aug 2012 18:59:20 +0000 (11:59 -0700)]
Merge "Remove the last .jam file."
Elliott Hughes [Thu, 9 Aug 2012 18:54:23 +0000 (11:54 -0700)]
Remove the last .jam file.
How did I miss this before?
Change-Id: I2e582133fc4800656fdd81104f8dfc7ee8f5b580
Elliott Hughes [Wed, 8 Aug 2012 23:51:01 +0000 (16:51 -0700)]
am
d504eee9: Merge "MIPS support to sys/ headers"
* commit '
d504eee9fa7dda59a41eb3e12ef973f32ee1169f':
MIPS support to sys/ headers
Elliott Hughes [Wed, 8 Aug 2012 23:32:55 +0000 (16:32 -0700)]
Merge "MIPS support to sys/ headers"
Elliott Hughes [Wed, 8 Aug 2012 23:19:25 +0000 (16:19 -0700)]
am
f655ce7e: Merge "Fix x86 build."
* commit '
f655ce7ef3df277442ccc47f91cb919c1cd9ebd6':
Fix x86 build.
Elliott Hughes [Wed, 8 Aug 2012 23:07:26 +0000 (16:07 -0700)]
Merge "Fix x86 build."
Elliott Hughes [Wed, 8 Aug 2012 23:06:51 +0000 (16:06 -0700)]
Fix x86 build.
Change-Id: Ice50ca71a19f3bf26de7cfd4c02075f1e6e0823f
Elliott Hughes [Wed, 8 Aug 2012 22:29:27 +0000 (15:29 -0700)]
am
78129204: Merge "Clean up the linker a bit, remove prelinking support."
* commit '
7812920487070d392984f94c9f80006dad8c198a':
Clean up the linker a bit, remove prelinking support.
Elliott Hughes [Wed, 8 Aug 2012 22:17:23 +0000 (15:17 -0700)]
Merge "Clean up the linker a bit, remove prelinking support."
Elliott Hughes [Wed, 8 Aug 2012 21:40:54 +0000 (14:40 -0700)]
am
34959e0b: Merge "Clean up libc/Android.mk a bit after the crtbrand changes."
* commit '
34959e0bd5c0d7c9d9b243adbf7752077436cbb5':
Clean up libc/Android.mk a bit after the crtbrand changes.
Elliott Hughes [Wed, 8 Aug 2012 21:32:23 +0000 (14:32 -0700)]
Merge "Clean up libc/Android.mk a bit after the crtbrand changes."
Elliott Hughes [Wed, 8 Aug 2012 21:07:37 +0000 (14:07 -0700)]
Clean up libc/Android.mk a bit after the crtbrand changes.
Change-Id: Icfb95fffe70967418cd93da8cbeae22dcd68f8c9
Jean-Baptiste Queru [Wed, 8 Aug 2012 21:04:19 +0000 (14:04 -0700)]
am
7e248be7: Merge "Add a .note.android.ident section to Android ELF binaries."
* commit '
7e248be76441daa0ee27cc461c806e6010405c25':
Add a .note.android.ident section to Android ELF binaries.
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:44:26 +0000 (13:44 -0700)]
Merge "Add a .note.android.ident section to Android ELF binaries."
Elliott Hughes [Fri, 3 Aug 2012 23:49:39 +0000 (16:49 -0700)]
Clean up the linker a bit, remove prelinking support.
Also make the errors more readable, since none of us seemed to know
what they actually meant. The new style is still as verbose as the
old, but that's probably necessary in the absence of chained exceptions
in C. Here's what you'd see if you try to boot after removing
libsurfaceflinger.so:
32267 32267 E AndroidRuntime: java.lang.UnsatisfiedLinkError: Cannot load library: (linker.c:1629, pid 32259) soinfo_link_image: could not load library "libsystem_server.so" needed by "libandroid_servers.so"; caused by (linker.c:1629, pid 32259) soinfo_link_image: could not load library "libsurfaceflinger.so" needed by "libsystem_server.so"; caused by (linker.c:709, pid 32259) load_library: library "libsurfaceflinger.so" not found
This patch also fixes almost all of the compiler warnings.
Change-Id: I64bb59aed6d4e039c15ea45be2367f319ef879f8
Shih-wei Liao [Mon, 6 Aug 2012 18:08:40 +0000 (11:08 -0700)]
am
e2731d98: Merge "When compiling with clang, don\'t "fortify_source" the strlcpy and strlcat."
* commit '
e2731d98c1f0cd32d94b34cc4ee77148d6d52647':
When compiling with clang, don't "fortify_source" the strlcpy and strlcat.
Shih-wei Liao [Mon, 6 Aug 2012 18:02:19 +0000 (11:02 -0700)]
Merge "When compiling with clang, don't "fortify_source" the strlcpy and strlcat."
Shih-wei Liao [Mon, 6 Aug 2012 17:57:37 +0000 (10:57 -0700)]
When compiling with clang, don't "fortify_source" the strlcpy and
strlcat.
Change-Id: I91f58322f28e425ab9d22b51c23fcd6b772ede97
Shih-wei Liao [Mon, 6 Aug 2012 17:17:09 +0000 (10:17 -0700)]
am
8173d767: Merge "Revert "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute""
* commit '
8173d76740cafc2ceb49d2fddf1ceabfaa823236':
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
Shih-wei Liao [Mon, 6 Aug 2012 17:17:08 +0000 (10:17 -0700)]
am
601a49d3: Merge "When compiling with clang, don\'t "fortify_source" the strlen."
* commit '
601a49d39829005803670088da02179e61719551':
When compiling with clang, don't "fortify_source" the strlen.
Shih-wei Liao [Mon, 6 Aug 2012 17:05:14 +0000 (10:05 -0700)]
Merge "Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute""
Shih-wei Liao [Mon, 6 Aug 2012 17:04:22 +0000 (10:04 -0700)]
Merge "When compiling with clang, don't "fortify_source" the strlen."
Shih-wei Liao [Mon, 6 Aug 2012 16:50:56 +0000 (09:50 -0700)]
When compiling with clang, don't "fortify_source" the strlen.
At this point, FORTIFY_SOURCE and clang are just plain incompatible.
Need to solve the underlying incompatibility first.
Change-Id: I3366477d19461e1ec93b1c30e0c7e8145b391b9b
Elliott Hughes [Mon, 6 Aug 2012 15:04:33 +0000 (08:04 -0700)]
am
7c92b6ca: Merge "Remove an awkward #include that is no longer upstream."
* commit '
7c92b6ca409f514e7ff67ac8c10d73ce92ff38d2':
Remove an awkward #include that is no longer upstream.
Elliott Hughes [Mon, 6 Aug 2012 14:57:59 +0000 (07:57 -0700)]
Merge "Remove an awkward #include that is no longer upstream."
Shih-wei Liao [Sat, 4 Aug 2012 00:44:08 +0000 (17:44 -0700)]
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
This reverts commit
4f1f149c3757c594f9ff987e5ddd919c3e7dba10.
Elliott Hughes [Fri, 3 Aug 2012 22:09:55 +0000 (15:09 -0700)]
am
1c861728: Merge "Remove yet more SH4 cruft."
* commit '
1c861728e5c8dda7589e6595f4850d77ec21a236':
Remove yet more SH4 cruft.
Elliott Hughes [Fri, 3 Aug 2012 22:05:15 +0000 (15:05 -0700)]
Merge "Remove yet more SH4 cruft."
Elliott Hughes [Fri, 3 Aug 2012 21:58:18 +0000 (14:58 -0700)]
Remove yet more SH4 cruft.
Surely this is the last piece?
Change-Id: I4bd43afb102334ec34d0e14a65c2b319826473d7
Elliott Hughes [Fri, 3 Aug 2012 21:27:08 +0000 (14:27 -0700)]
am
aea5f00d: Merge "bionic: modify syscall to use 6 registers to pass parameter."
* commit '
aea5f00df4704a618331e16473b552e54bed269b':
bionic: modify syscall to use 6 registers to pass parameter.
Elliott Hughes [Fri, 3 Aug 2012 20:55:56 +0000 (13:55 -0700)]
Merge "bionic: modify syscall to use 6 registers to pass parameter."
Jin Wei [Thu, 12 Apr 2012 08:50:42 +0000 (16:50 +0800)]
bionic: modify syscall to use 6 registers to pass parameter.
Kernel allows to use 6 registers(exclude eax) to pass parameter.
But in syscall's implementation, it only uses five registers.
It will lead to error when 6 parameters passed.
Change-Id: I92d663194e6334c3847f0c0c257ca3b9dee0edef
Author: Jin Wei <wei.a.jin@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 30838
Elliott Hughes [Fri, 3 Aug 2012 20:30:44 +0000 (13:30 -0700)]
am
1510795f: Merge "Upgrade to tzdata2012e."
* commit '
1510795fec5aa8b8700a08200f37f6e57dea8d04':
Upgrade to tzdata2012e.
Elliott Hughes [Fri, 3 Aug 2012 19:30:18 +0000 (12:30 -0700)]
Merge "Upgrade to tzdata2012e."
Elliott Hughes [Fri, 3 Aug 2012 19:26:06 +0000 (12:26 -0700)]
Upgrade to tzdata2012e.
Includes this change:
* australasia (Pacific/Fakaofo): Tokelau is UTC+13, not UTC+14.
(Thanks to Steffen Thorsen.)
Change-Id: I51bfab759f424b90daeb1960c6cfb2b55b78ff46
David Turner [Fri, 3 Aug 2012 11:57:56 +0000 (04:57 -0700)]
am
16d40217: Merge "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute"
* commit '
16d40217d05a1d9ad8ec475ce5f68c35bbef7029':
Fix the clang build: this compiler doesn't support the gnu_inline function attribute
David Turner [Fri, 3 Aug 2012 11:40:36 +0000 (04:40 -0700)]
Merge "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
Shih-wei Liao [Fri, 3 Aug 2012 11:20:06 +0000 (04:20 -0700)]
Fix the clang build: this compiler doesn't support the gnu_inline function attribute
Recent clang compiler doesn't have gnu_inline working. When frameworks/rs
is compiled with clang instead of gcc, it no longer works. Will be fixed
by this patch.
Change-Id: I8b281a1305151909e18958b73914ea27343cb4cd
Elliott Hughes [Fri, 3 Aug 2012 01:45:56 +0000 (18:45 -0700)]
am
1e304a3b: Merge "[MIPS] Support for TLS register"
* commit '
1e304a3bce347da08f0f9409829d911493bad1bb':
[MIPS] Support for TLS register
Elliott Hughes [Fri, 3 Aug 2012 01:33:19 +0000 (18:33 -0700)]
Merge "[MIPS] Support for TLS register"
Elliott Hughes [Fri, 3 Aug 2012 01:12:36 +0000 (18:12 -0700)]
Remove an awkward #include that is no longer upstream.
This was causing trouble in https://android-review.googlesource.com/#/c/37590/.
Change-Id: Ib7cb4fbaef6e9c1470c59f67d24bd24c7ce90bcc
Raghu Gandham [Thu, 2 Aug 2012 23:50:10 +0000 (16:50 -0700)]
MIPS support to sys/ headers
Change-Id: I32207a1d918e4842da341f6b242ae39c69a83b03
Raghu Gandham [Fri, 3 Aug 2012 00:47:37 +0000 (17:47 -0700)]
[MIPS] Support for TLS register
Change-Id: I6b5194e5e379b573e3b1203d8015e20fb3edd647
Signed-off-by: Chris Dearman <chris@mips.com>
Elliott Hughes [Thu, 2 Aug 2012 23:32:47 +0000 (16:32 -0700)]
am
52f3ee96: Merge "MIPS support for libc."
* commit '
52f3ee962b384bf247638adb653f0024ce92a895':
MIPS support for libc.
Elliott Hughes [Thu, 2 Aug 2012 23:14:47 +0000 (16:14 -0700)]
Merge "MIPS support for libc."
Raghu Gandham [Thu, 26 Jul 2012 01:16:42 +0000 (18:16 -0700)]
MIPS support for libc.
Change-Id: I2864dea04b3faf2d919165dcaa600af5b16c41c8
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
Elliott Hughes [Thu, 2 Aug 2012 22:59:22 +0000 (15:59 -0700)]
am
a1c0f08d: Merge "Fix a ENOTUP/ENOTSUP typo."
* commit '
a1c0f08d3ccbe5c40be53903615e59113ade4922':
Fix a ENOTUP/ENOTSUP typo.
Elliott Hughes [Thu, 2 Aug 2012 22:59:21 +0000 (15:59 -0700)]
am
994935f6: Merge "Error numbers are target specific."
* commit '
994935f64cdbd7553ecbfbd15d4e4dd429277409':
Error numbers are target specific.
Elliott Hughes [Thu, 2 Aug 2012 22:46:43 +0000 (15:46 -0700)]
Merge "Fix a ENOTUP/ENOTSUP typo."
Elliott Hughes [Thu, 2 Aug 2012 22:45:04 +0000 (15:45 -0700)]
Fix a ENOTUP/ENOTSUP typo.
Change-Id: Ifa347a09a2aa1f505965ae7c1383fd0caf95793c
Elliott Hughes [Thu, 2 Aug 2012 22:42:48 +0000 (15:42 -0700)]
Merge "Error numbers are target specific."
Elliott Hughes [Thu, 2 Aug 2012 21:57:52 +0000 (14:57 -0700)]
am
f34ecbff: Merge "MIPS support to the linker"
* commit '
f34ecbff0dd2b8e6961020b8c91260f33d4cf3ea':
MIPS support to the linker
Elliott Hughes [Thu, 2 Aug 2012 21:43:55 +0000 (14:43 -0700)]
Merge "MIPS support to the linker"
Raghu Gandham [Tue, 31 Jul 2012 19:07:22 +0000 (12:07 -0700)]
MIPS support to the linker
Change-Id: I37ec2d6c51d82bb9e9dbfef4b38c85366bead255
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
Signed-off-by: Bhanu Chetlapalli <bhanu@mips.com>
Chris Dearman [Sat, 28 Jan 2012 01:55:49 +0000 (17:55 -0800)]
Error numbers are target specific.
Use the system supplied error numbers when mapping error numbers to messages.
Change-Id: I520556fa3e2ff668fdc4eda36ad31491fbb48ea8
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
Shih-wei Liao [Wed, 1 Aug 2012 04:00:39 +0000 (21:00 -0700)]
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.
Shih-wei Liao [Wed, 1 Aug 2012 03:54:18 +0000 (20:54 -0700)]
Merge "Had include/arm/fenv.h, but missed include/mips/fenv.h."
Elliott Hughes [Tue, 31 Jul 2012 22:31:53 +0000 (15:31 -0700)]
am
b910b6f8: Merge "Updated the cleaned header file mman.h for MIPS."
* commit '
b910b6f8dee14e379664635f4cd7343b3acc7b27':
Updated the cleaned header file mman.h for MIPS.
Elliott Hughes [Tue, 31 Jul 2012 22:16:07 +0000 (15:16 -0700)]
Merge "Updated the cleaned header file mman.h for MIPS."
Raghu Gandham [Thu, 26 Jul 2012 01:16:42 +0000 (18:16 -0700)]
Updated the cleaned header file mman.h for MIPS.
Change-Id: I8b3734e535711ca07fbf4066e6d967d1ce0f30eb
Elliott Hughes [Tue, 31 Jul 2012 17:38:26 +0000 (10:38 -0700)]
am
a513f70b: Merge "bionic: Stack pointer/signal race condition."
* commit '
a513f70b43e75136145d756388b50028ac4fc4b8':
bionic: Stack pointer/signal race condition.
Elliott Hughes [Tue, 31 Jul 2012 17:38:25 +0000 (10:38 -0700)]
am
21372896: Merge "fix __cxa_finalize() implementation to be thread safe."
* commit '
21372896ea0f13938c130c8c82cdc3a6b9ccd297':
fix __cxa_finalize() implementation to be thread safe.
Elliott Hughes [Tue, 31 Jul 2012 17:32:58 +0000 (10:32 -0700)]
Merge "bionic: Stack pointer/signal race condition."
Elliott Hughes [Tue, 31 Jul 2012 17:31:20 +0000 (10:31 -0700)]
Merge "fix __cxa_finalize() implementation to be thread safe."
Srinavasa Nagaraju [Tue, 28 Feb 2012 03:08:22 +0000 (12:08 +0900)]
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
Michael Hope [Tue, 31 Jul 2012 04:18:22 +0000 (16:18 +1200)]
Add a .note.android.ident section to Android ELF binaries.
This allows debugging tools to know they are working with Android
binaries and adapt accordingly.
Signed-off-by: Thiago Jung Bauermann <thiago.bauermann@linaro.org>
Signed-off-by: Michael Hope <michael.hope@linaro.org>
Change-Id: Ic906992fcad61c028bb765821637a3e1333bf52b
Shih-wei Liao [Tue, 31 Jul 2012 03:12:46 +0000 (20:12 -0700)]
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
Shih-wei Liao [Mon, 30 Jul 2012 20:10:11 +0000 (13:10 -0700)]
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.
Shih-wei Liao [Mon, 30 Jul 2012 19:44:57 +0000 (12:44 -0700)]
Merge "Install crt(begin|end)_so.o to target library path."
Shih-wei Liao [Sat, 28 Jul 2012 07:33:28 +0000 (00:33 -0700)]
Install crt(begin|end)_so.o to target library path.
BUG=
6886348.
Change-Id: I176b2c4963d9731b06d10d4e0b92c010a0006b59
Elliott Hughes [Sat, 28 Jul 2012 01:28:11 +0000 (18:28 -0700)]
am
643e5722: Merge "Report errors to the log, not just stderr."
* commit '
643e5722338d303c0b5aac41107432d8fde4081c':
Report errors to the log, not just stderr.
Elliott Hughes [Sat, 28 Jul 2012 01:16:17 +0000 (18:16 -0700)]
Merge "Report errors to the log, not just stderr."
Elliott Hughes [Sat, 28 Jul 2012 00:40:29 +0000 (17:40 -0700)]
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
Elliott Hughes [Fri, 27 Jul 2012 22:58:57 +0000 (15:58 -0700)]
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.
Elliott Hughes [Fri, 27 Jul 2012 22:47:37 +0000 (15:47 -0700)]
am
9061c6e7: Merge "Replace ALL_PREBUILTS with BUILD_PREBUILT"
* commit '
9061c6e7ae1d9b0e4d2f8a62b3682a565282f9b9':
Replace ALL_PREBUILTS with BUILD_PREBUILT
Elliott Hughes [Fri, 27 Jul 2012 22:43:10 +0000 (15:43 -0700)]
Merge "Fix a TEMP_FAILURE_RETRY usage error in the linker."
Elliott Hughes [Fri, 27 Jul 2012 22:30:51 +0000 (15:30 -0700)]
Fix a TEMP_FAILURE_RETRY usage error in the linker.
Similar to the fix in
c20d0f3993ebb0d3dec958a306a68ebb48bfeadd.
grep(1) says this was the only other instance in bionic.
Change-Id: I1729038762ee1c7c4743a6bd11d5558afd6f5749
The Android Open Source Project [Fri, 27 Jul 2012 21:49:51 +0000 (14:49 -0700)]
Reconcile with jb-release
Change-Id: I89a2498aeb91f29a70f1e100c41f03cf41a2e49e
Elliott Hughes [Fri, 27 Jul 2012 21:14:41 +0000 (14:14 -0700)]
Merge "Replace ALL_PREBUILTS with BUILD_PREBUILT"
Ying Wang [Thu, 26 Jul 2012 22:55:18 +0000 (15:55 -0700)]
Replace ALL_PREBUILTS with BUILD_PREBUILT
(cherry-picked from
186b36b65bdfbf2c89a661539bf530359364eac9.)
Bug:
6857263
Change-Id: If787d84415dd2ac07105fe0d0b7a27c9be75df64
Elliott Hughes [Fri, 27 Jul 2012 17:14:50 +0000 (10:14 -0700)]
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
Elliott Hughes [Fri, 27 Jul 2012 17:02:59 +0000 (10:02 -0700)]
Merge "Correction to use of TEMP_FAILURE_RETRY in send_prop_msg"
Jens Gulin [Thu, 19 Jul 2012 12:10:46 +0000 (14:10 +0200)]
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
Peter Enderborg [Mon, 9 Jul 2012 14:17:17 +0000 (16:17 +0200)]
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
Elliott Hughes [Fri, 27 Jul 2012 00:44:38 +0000 (17:44 -0700)]
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.
Elliott Hughes [Fri, 27 Jul 2012 00:36:21 +0000 (17:36 -0700)]
Merge "Remove the 'Factory' time zone by not processing the 'factory' file."
Elliott Hughes [Thu, 26 Jul 2012 23:19:46 +0000 (16:19 -0700)]
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
Nick Kralevich [Thu, 26 Jul 2012 05:22:20 +0000 (22:22 -0700)]
am
cc5edd83: Merge "vfprintf: fix spelling."
* commit '
cc5edd83ec0303ceb682c563073d98f8a592737d':
vfprintf: fix spelling.
Nick Kralevich [Wed, 25 Jul 2012 23:09:34 +0000 (16:09 -0700)]
Merge "vfprintf: fix spelling."
Nick Kralevich [Wed, 25 Jul 2012 23:01:38 +0000 (16:01 -0700)]
vfprintf: fix spelling.
Change-Id: I6dc611143fb1f3e9ccf0a77b40ee48a3c1d72ca9
The Android Automerger [Wed, 25 Jul 2012 03:23:07 +0000 (20:23 -0700)]
merge in jb-release history after reset to jb-dev
Elliott Hughes [Wed, 25 Jul 2012 01:03:22 +0000 (18:03 -0700)]
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()
Elliott Hughes [Wed, 25 Jul 2012 01:03:12 +0000 (18:03 -0700)]
am
c98e2365: Merge "Fix implementation of generic atomic operations"
* commit '
c98e2365cdd0c2330711118b689171df143f6399':
Fix implementation of generic atomic operations