Elliott Hughes
2d23418e68
am 18442e02: (-s ours) am beb6e08a: Sync with upstream NetBSD lib/libc/regex.
...
* commit '18442e023536c5cf205b820ed5d74b972b710acb':
Sync with upstream NetBSD lib/libc/regex.
2015-10-19 10:07:34 -07:00
Elliott Hughes
18442e0235
am beb6e08a: Sync with upstream NetBSD lib/libc/regex.
...
* commit 'beb6e08abf1393663151afde2742bb23eccab4e1':
Sync with upstream NetBSD lib/libc/regex.
2015-10-19 15:34:19 +00:00
Elliott Hughes
630855a6d5
am 6764e0b5: am d29ba555: Merge "Opt Brillo out of the ndk cruft."
...
* commit '6764e0b5e546c318d13fcac0ddbf0bea88271768':
Opt Brillo out of the ndk cruft.
2015-10-17 03:16:47 +00:00
Elliott Hughes
6764e0b5e5
am d29ba555: Merge "Opt Brillo out of the ndk cruft."
...
* commit 'd29ba555130f1e61164cf6186cd6a29c7aa14719':
Opt Brillo out of the ndk cruft.
2015-10-16 20:10:48 -07:00
Elliott Hughes
d29ba55513
Merge "Opt Brillo out of the ndk cruft."
2015-10-17 03:06:41 +00:00
Elliott Hughes
beb6e08abf
Sync with upstream NetBSD lib/libc/regex.
...
Bug: http://b/22850181
(cherry-picked from commit 71927a82379f7a72559ea96e6678d6215090937f)
Change-Id: I11a51a2031e68a953ccd5691da98c699c7d01904
2015-10-16 17:52:55 -07:00
Dimitry Ivanov
a60b1aebb7
am 114605b0: am 5fd94dfe: Merge "Replace auto -> const auto&/auto&&"
...
* commit '114605b03666230f11113990b828356bfe692278':
Replace auto -> const auto&/auto&&
2015-10-16 20:48:32 +00:00
Dimitry Ivanov
56cd1962b2
am c0e917ab: am 9c2122e8: Merge "Fix R_AARCH64_ABS/PREL relocations"
...
* commit 'c0e917abe5e94ce9729a8302b5ef3cb318003ea5':
Fix R_AARCH64_ABS/PREL relocations
2015-10-16 20:48:30 +00:00
Dimitry Ivanov
114605b036
am 5fd94dfe: Merge "Replace auto -> const auto&/auto&&"
...
* commit '5fd94dfe3b36ee56e54d2002ad3a5e0fa8bff683':
Replace auto -> const auto&/auto&&
2015-10-16 13:41:45 -07:00
Dimitry Ivanov
c0e917abe5
am 9c2122e8: Merge "Fix R_AARCH64_ABS/PREL relocations"
...
* commit '9c2122e803a01c80bef550eac2b24b5a79635a2a':
Fix R_AARCH64_ABS/PREL relocations
2015-10-16 13:41:44 -07:00
Dimitry Ivanov
5fd94dfe3b
Merge "Replace auto -> const auto&/auto&&"
2015-10-16 20:37:34 +00:00
Dimitry Ivanov
9c2122e803
Merge "Fix R_AARCH64_ABS/PREL relocations"
2015-10-16 20:36:25 +00:00
Dmitriy Ivanov
77f91c6d99
Fix R_AARCH64_ABS/PREL relocations
...
According to specification arm64 relocations
should not use *reloc value.
See http://infocenter.arm.com/help/topic/com.arm.doc.ihi0056b/IHI0056B_aaelf64.pdf
section 4.6.5
Bug: http://b/24977219
Bug: http://b/24527155
Change-Id: I3813255771f408ba957963c6ad56ed08e5110d83
2015-10-16 10:42:16 -07:00
Neil Fuller
3676052ce7
am 842866bd: Merge "Update timezone data to 2015g" into mnc-dr-dev
...
* commit '842866bd00220119e03fd8d2e6b77d7187b4b38c':
Update timezone data to 2015g
2015-10-15 09:21:59 +00:00
Neil Fuller
842866bd00
Merge "Update timezone data to 2015g" into mnc-dr-dev
2015-10-15 08:25:58 +00:00
Dmitriy Ivanov
845dd0266b
resolved conflicts for 95ac6dbb to mnc-dr-dev-plus-aosp
...
Change-Id: I8937cd33aa375824965d4f919038a99b30ab75ea
2015-10-14 18:41:36 -07:00
Dimitry Ivanov
c70d479dc6
am 8c9cb682: am 074efa02: Merge "Ensure that readlink has access to /proc/self/fd"
...
* commit '8c9cb6820fca3f73414219d816e10355a7052dbd':
Ensure that readlink has access to /proc/self/fd
2015-10-15 01:37:37 +00:00
Dimitry Ivanov
8c9cb6820f
am 074efa02: Merge "Ensure that readlink has access to /proc/self/fd"
...
* commit '074efa02a7de67589c36f75222e3b45c3f15206a':
Ensure that readlink has access to /proc/self/fd
2015-10-15 01:31:15 +00:00
Christopher Ferris
9e2d37ccae
am 3c30a156: Merge "Sync with upstream NetBSD lib/libc/regex." into mnc-dr-dev
...
* commit '3c30a156523f40250361e6ed8791919d1c71a4bb':
Sync with upstream NetBSD lib/libc/regex.
2015-10-15 01:29:05 +00:00
Dimitry Ivanov
074efa02a7
Merge "Ensure that readlink has access to /proc/self/fd"
2015-10-15 01:27:17 +00:00
Dmitriy Ivanov
4e50d0247b
Ensure that readlink has access to /proc/self/fd
...
/proc/self/fd is not available when PR_DUMPABLE is set to 0
which is default for the user builds. It leads to permission
denials on readlink.
This change fixes the problem by setting PR_DUMPABLE flag to 1
for readlink and restoring it's previous value after the call.
Bug: http://b/24912743
Change-Id: I3fd179c5c6b56af96d6a15ee597024ccb15e1a13
(cherry picked from commit cf92738fa5dee24050028a1235f815f2a0fd33b5)
2015-10-14 18:24:54 -07:00
Dimitry Ivanov
95ac6dbbb2
Merge "Ensure that readlink has access to /proc/self/fd" into mnc-dr-dev
2015-10-15 01:17:55 +00:00
Christopher Ferris
3c30a15652
Merge "Sync with upstream NetBSD lib/libc/regex." into mnc-dr-dev
2015-10-15 01:15:22 +00:00
Josh Gao
b16f1b4b89
am 559d9cf5: am c433a36f: Merge "Move malloc dispatch table to __libc_globals."
...
* commit '559d9cf5fa6d5339d1578530a73ecb81a91c27d9':
Move malloc dispatch table to __libc_globals.
2015-10-14 23:54:59 +00:00
Josh Gao
559d9cf5fa
am c433a36f: Merge "Move malloc dispatch table to __libc_globals."
...
* commit 'c433a36fb5fb8a1050e8ecbd94d215123b829e07':
Move malloc dispatch table to __libc_globals.
2015-10-14 23:50:51 +00:00
Josh Gao
c433a36fb5
Merge "Move malloc dispatch table to __libc_globals."
2015-10-14 23:47:41 +00:00
Elliott Hughes
9a9572d577
Sync with upstream NetBSD lib/libc/regex.
...
Bug: http://b/22850181
(cherry picked from commit 71927a82379f7a72559ea96e6678d6215090937f)
Change-Id: I4a914f0594a66f38efb3026b7ba9d28a4887cb2d
2015-10-14 16:30:08 -07:00
Dmitriy Ivanov
cf92738fa5
Ensure that readlink has access to /proc/self/fd
...
/proc/self/fd is not available when PR_DUMPABLE is set to 0
which is default for the user builds. It leads to permission
denials on readlink.
This change fixes the problem by setting PR_DUMPABLE flag to 1
for readlink and restoring it's previous value after the call.
Bug: http://b/24912743
Change-Id: I3fd179c5c6b56af96d6a15ee597024ccb15e1a13
2015-10-14 11:15:45 -07:00
Neil Fuller
cd9278798a
Update timezone data to 2015g
...
Changes affecting future time stamps
Turkey's 2015 fall-back transition is scheduled for Nov. 8, not Oct. 25.
(Thanks to Fatih.)
Norfolk moves from +1130 to +1100 on 2015-10-04 at 02:00 local time.
(Thanks to Alexander Krivenyshev.)
Fiji's 2016 fall-back transition is scheduled for January 17, not 24.
(Thanks to Ken Rylander.)
Fort Nelson, British Columbia will not fall back on 2015-11-01. It has
effectively been on MST (-0700) since it advanced its clocks on 2015-03-08.
New zone America/Fort_Nelson. (Thanks to Matt Johnson.)
Changes affecting past time stamps
Norfolk observed DST from 1974-10-27 02:00 to 1975-03-02 02:00.
Bug: 24595281
(cherry-picked from commit 31740bfdb942399235e42ea920b6b717dfa0279c)
Change-Id: I6a57fbdaf12a4b4ebf2a760fd3bd872055621106
2015-10-14 08:54:17 +00:00
Josh Gao
87bb58064d
am 36ebee4f: am 198d13e8: Merge "make mmap fail on requests larger than PTRDIFF_MAX"
...
* commit '36ebee4f495b0c49ed686221dfe127f4ccd12b52':
make mmap fail on requests larger than PTRDIFF_MAX
2015-10-14 02:27:42 +00:00
Josh Gao
36ebee4f49
am 198d13e8: Merge "make mmap fail on requests larger than PTRDIFF_MAX"
...
* commit '198d13e8c25e69f7dbda3f5e1a3258b13fe8db5d':
make mmap fail on requests larger than PTRDIFF_MAX
2015-10-14 02:21:04 +00:00
Josh Gao
198d13e8c2
Merge "make mmap fail on requests larger than PTRDIFF_MAX"
2015-10-14 02:17:10 +00:00
Dimitry Ivanov
b8ab96910f
am 090278d6: am 11c2179d: Merge "Log dlopen failures caused by text relocations"
...
* commit '090278d6c6e3501836c70ce555996511b96a38d9':
Log dlopen failures caused by text relocations
2015-10-13 23:01:36 +00:00
Dimitry Ivanov
090278d6c6
am 11c2179d: Merge "Log dlopen failures caused by text relocations"
...
* commit '11c2179d468bba3336c3a3e8418ddaa98f58afce':
Log dlopen failures caused by text relocations
2015-10-13 22:53:03 +00:00
Dimitry Ivanov
11c2179d46
Merge "Log dlopen failures caused by text relocations"
2015-10-13 22:50:05 +00:00
Dmitriy Ivanov
fae39d2bf9
Log dlopen failures caused by text relocations
...
Some apps will fail to load native libraries with
text relocations when switching target sdk version to M.
It could be hard to diagnose because some of them
suppress dlerror and/or UnsatisfiedLinkError.
This change unconditionally logs the error message making
the cause of the failure more visible to developers.
Bug: http://b/24876001
Change-Id: I0477a0d1307d0879000f3a3a43b974b4cf34bdb2
(cherry picked from commit f32b689d3dbe7a1317bce58d1d9bef9bba173c66)
2015-10-13 15:48:57 -07:00
Dmitriy Ivanov
1002265d0a
resolved conflicts for f32b689d to mnc-dr-dev-plus-aosp
...
Change-Id: I95f90eb68dcb4b3f4b3d80260b2285c78692b535
2015-10-13 14:59:20 -07:00
Dimitry Ivanov
7197c2909d
am 5db60c04: am 30cd7065: Merge "Correctly resolve realpath for absolute paths"
...
* commit '5db60c04c68ed5f0d9ef9bc0e8c2a84062287b8d':
Correctly resolve realpath for absolute paths
2015-10-13 20:51:11 +00:00
Dimitry Ivanov
5db60c04c6
am 30cd7065: Merge "Correctly resolve realpath for absolute paths"
...
* commit '30cd7065b6cd37342e23904cb512c409b8bbd4f1':
Correctly resolve realpath for absolute paths
2015-10-13 20:43:36 +00:00
Dimitry Ivanov
30cd7065b6
Merge "Correctly resolve realpath for absolute paths"
2015-10-13 20:37:55 +00:00
Dmitriy Ivanov
5dce8948b6
Replace auto -> const auto&/auto&&
...
Change-Id: Ie484e5a296b5dd222a9545d8539d40d97a6c158c
2015-10-13 12:14:16 -07:00
Dmitriy Ivanov
f32b689d3d
Log dlopen failures caused by text relocations
...
Some apps will fail to load native libraries with
text relocations when switching target sdk version to M.
It could be hard to diagnose because some of them
suppress dlerror and/or UnsatisfiedLinkError.
This change unconditionally logs the error message making
the cause of the failure more visible to developers.
Bug: http://b/24876001
Change-Id: I0477a0d1307d0879000f3a3a43b974b4cf34bdb2
2015-10-13 11:13:19 -07:00
Lazar Trsic
6f2d3104c8
Correctly resolve realpath for absolute paths
...
Introduced by: https://android-review.googlesource.com/174475
Change-Id: I44e00040b28be167d5141454f919340afec6084e
2015-10-13 10:57:41 -07:00
Neil Fuller
1cdd99bcb9
am 12b4f21e: am fb7f45b6: Merge "Update timezone data to 2015g"
...
* commit '12b4f21e1969b0eceeedb52b2ff0f77a1f791908':
Update timezone data to 2015g
2015-10-13 09:24:08 +00:00
Neil Fuller
12b4f21e19
am fb7f45b6: Merge "Update timezone data to 2015g"
...
* commit 'fb7f45b6a3242c9a9a547705de08cf59e6b7f935':
Update timezone data to 2015g
2015-10-13 09:14:17 +00:00
Neil Fuller
fb7f45b6a3
Merge "Update timezone data to 2015g"
2015-10-13 08:26:44 +00:00
Dimitry Ivanov
433cdaa85f
am 5a805d91: am a5ad727e: Merge "linker: Switch to clang"
...
* commit '5a805d919c0a531c0e8bbae746d192db218d625d':
linker: Switch to clang
2015-10-13 01:46:10 +00:00
Dimitry Ivanov
5a805d919c
am a5ad727e: Merge "linker: Switch to clang"
...
* commit 'a5ad727e7619f4497792d67ae05b8ef15315b362':
linker: Switch to clang
2015-10-13 01:40:49 +00:00
Dimitry Ivanov
a5ad727e76
Merge "linker: Switch to clang"
2015-10-13 01:34:59 +00:00
Dmitriy Ivanov
b28ffc7744
linker: Switch to clang
...
x86_64 gcc exports malloc/free and co functions because they
are defined with visibility "default" somewhere in gcc builtins;
and vector d-tors for some reason. Switching to clang fixes
this problem.
Bug: http://b/24785482
Change-Id: I741503b4b446523e7ff3fb16de13ed99991fd0c0
2015-10-12 18:20:26 -07:00