OSDN Git Service
Elliott Hughes [Mon, 6 Jul 2015 22:54:52 +0000 (22:54 +0000)]
am
89bbb846: Merge "Fix alignment after variable-length data."
* commit '
89bbb846b9831f232b87d54a6eeb759ac603cc43':
Fix alignment after variable-length data.
Elliott Hughes [Mon, 6 Jul 2015 21:44:31 +0000 (21:44 +0000)]
Merge "Fix alignment after variable-length data."
Elliott Hughes [Mon, 6 Jul 2015 21:16:12 +0000 (14:16 -0700)]
Fix alignment after variable-length data.
In the serialized output from netd, the strings come first. Some code
assumes -- reasonably enough -- that it can do unaligned reads of pointers,
so we need to ensure alignment after all the strings.
(cherrypick of
65dd858239c4e32a5a1afbc14ac30dbcdd2a50a3.)
Bug: http://b/
21192318
Change-Id: I456639127db9a2583f7f738e6b8103375d9387fd
Elliott Hughes [Mon, 6 Jul 2015 20:22:48 +0000 (20:22 +0000)]
am
f542b309: Merge "Name the thread stack and signal stack guard pages."
* commit '
f542b30970ae863caceea1f635115f1195461e31':
Name the thread stack and signal stack guard pages.
Elliott Hughes [Mon, 6 Jul 2015 19:59:42 +0000 (19:59 +0000)]
Merge "Name the thread stack and signal stack guard pages."
Elliott Hughes [Thu, 2 Jul 2015 06:48:39 +0000 (23:48 -0700)]
Name the thread stack and signal stack guard pages.
Bug: http://b/
22228722
Change-Id: I1dae672e386e404fb304a34496a29fe21134c784
Dmitriy Ivanov [Wed, 1 Jul 2015 17:12:54 +0000 (17:12 +0000)]
am
f643eb38: Improve personality initialization
* commit '
f643eb38c36eb63f612e20dea09fd43ac6a6b360':
Improve personality initialization
Elliott Hughes [Wed, 1 Jul 2015 15:58:17 +0000 (15:58 +0000)]
am
77455f85: Merge "Fixed uchar.h for clang3.6"
* commit '
77455f85ab46bed6dc5f7246b474ede44ae9ede2':
Fixed uchar.h for clang3.6
Elliott Hughes [Wed, 1 Jul 2015 15:32:57 +0000 (15:32 +0000)]
Merge "Fixed uchar.h for clang3.6"
Neil Fuller [Wed, 1 Jul 2015 10:06:29 +0000 (10:06 +0000)]
am
86061f39: Merge "Update timezone data to 2015e"
* commit '
86061f39c2c5f5a5ee91b349d1c8cb7bf04003a3':
Update timezone data to 2015e
Neil Fuller [Wed, 1 Jul 2015 09:42:18 +0000 (09:42 +0000)]
Merge "Update timezone data to 2015e"
Dmitriy Ivanov [Wed, 1 Jul 2015 02:36:04 +0000 (02:36 +0000)]
am
416695a7: Merge "Improve personality initialization"
* commit '
416695a75c3892dd709a80ea8a640da07082594e':
Improve personality initialization
Dmitriy Ivanov [Wed, 1 Jul 2015 02:12:52 +0000 (02:12 +0000)]
Merge "Improve personality initialization"
Dmitriy Ivanov [Tue, 30 Jun 2015 22:10:51 +0000 (15:10 -0700)]
Improve personality initialization
1. Personality parameter should be unsigned int (not long)
2. Do not reset bits outside of PER_MASK when setting
personality value.
3. Set personality for static executables.
Bug: http://b/
21900686
Change-Id: I4c7e34079cbd59b818ce221eed325c05b9bb2303
(cherry picked from commit
f643eb38c36eb63f612e20dea09fd43ac6a6b360)
Dmitriy Ivanov [Tue, 30 Jun 2015 22:10:51 +0000 (15:10 -0700)]
Improve personality initialization
1. Personality parameter should be unsigned int (not long)
2. Do not reset bits outside of PER_MASK when setting
personality value.
3. Set personality for static executables.
Bug: http://b/
21900686
Change-Id: I4c7e34079cbd59b818ce221eed325c05b9bb2303
Neil Fuller [Tue, 30 Jun 2015 13:48:06 +0000 (14:48 +0100)]
Update timezone data to 2015e
Changes affecting future time stamps
Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00,
not 06-13 and 07-18 as we had guessed. (Thanks to Milamber.)
Assume Cayman Islands will observe DST starting next year, using US rules.
Although it isn't guaranteed, it is the most likely.
Bug:
21836574
Change-Id: I6eda60c220d5c55d2aa0934544866ec0f1ce62ab
Erik Kline [Tue, 30 Jun 2015 06:22:24 +0000 (06:22 +0000)]
am
754f6690: Pass around struct android_net_context for better behaviour
* commit '
754f669076ec1edfc0d597aaf89600d4c93f9a7c':
Pass around struct android_net_context for better behaviour
Erik Kline [Thu, 25 Jun 2015 05:27:34 +0000 (14:27 +0900)]
Pass around struct android_net_context for better behaviour
Group network context elements in to a single struct and
add a version of android_getaddrinfofornet() that accepts it.
The introduction of UID-based routing means that the UID is an
integral part of the network context when evaluating connectivity,
sorting addresses, etc.
Also, introduce a distinction between DNS netids/marks and those
expected to be used by the application. This can be important
when the network an application is using is not the same as the
network on which DNS queries will be issued.
Additionally, de-duplicate the UDP connect logic (collapse both
_test_connect() and _find_src_addr() into just the latter).
Bug:
19470192
Bug:
20733156
Bug:
21832279
Change-Id: If16c2f4744695f507993afdac078ca105eb5d3e4
(cherry picked from commit
01e37c9665018534c798daaa59d5b0adb408e0a4)
Erik Kline [Tue, 30 Jun 2015 02:42:17 +0000 (02:42 +0000)]
am
7f46cf9a: Merge "Pass around struct android_net_context for better behaviour"
* commit '
7f46cf9a5f0b3e54d97fc94a83b955ae4c335a31':
Pass around struct android_net_context for better behaviour
Erik Kline [Tue, 30 Jun 2015 02:21:00 +0000 (02:21 +0000)]
Merge "Pass around struct android_net_context for better behaviour"
Dmitriy Ivanov [Mon, 29 Jun 2015 22:41:55 +0000 (22:41 +0000)]
am
f7d5bf33: Lock on dl_interate_phdr
* commit '
f7d5bf334dc4bc5b7399d4c8268e1b0bf676548f':
Lock on dl_interate_phdr
Dmitriy Ivanov [Mon, 29 Jun 2015 22:38:20 +0000 (22:38 +0000)]
am
83474cd3: Merge "Lock on dl_interate_phdr"
* commit '
83474cd38712c0f955174609a880deabebb27518':
Lock on dl_interate_phdr
Dmitriy Ivanov [Mon, 29 Jun 2015 22:15:07 +0000 (22:15 +0000)]
Merge "Lock on dl_interate_phdr"
Dmitriy Ivanov [Mon, 29 Jun 2015 21:48:25 +0000 (14:48 -0700)]
Lock on dl_interate_phdr
There is possibility of someone dlclosing a library
while dl_iterate_phdr in progress which can lead to
dl_iterate_phdr calling callback with invalid address
if it was unmapped by dlclose.
Bug: http://b/
22047255
Change-Id: I3fc0d9fd2c51fb36fd34cb035f37271fa893a7be
(cherry picked from commit
f7d5bf334dc4bc5b7399d4c8268e1b0bf676548f)
Dmitriy Ivanov [Mon, 29 Jun 2015 21:48:25 +0000 (14:48 -0700)]
Lock on dl_interate_phdr
There is possibility of someone dlclosing a library
while dl_iterate_phdr in progress which can lead to
dl_iterate_phdr calling callback with invalid address
if it was unmapped by dlclose.
Bug: http://b/
22047255
Change-Id: I3fc0d9fd2c51fb36fd34cb035f37271fa893a7be
Dmitriy Ivanov [Mon, 29 Jun 2015 21:34:07 +0000 (21:34 +0000)]
am
46d24d12: Merge "Replace NULL with nullptr"
* commit '
46d24d12e167a0b5afa4ded218aa4db0a477141a':
Replace NULL with nullptr
Elliott Hughes [Mon, 29 Jun 2015 21:23:22 +0000 (21:23 +0000)]
am
25da2d7c: Merge "Add <sysexits.h>."
* commit '
25da2d7ca2795156552ed96e1f3c3245330682b0':
Add <sysexits.h>.
Dmitriy Ivanov [Mon, 29 Jun 2015 21:08:48 +0000 (21:08 +0000)]
Merge "Replace NULL with nullptr"
Elliott Hughes [Mon, 29 Jun 2015 21:01:05 +0000 (21:01 +0000)]
Merge "Add <sysexits.h>."
Elliott Hughes [Mon, 29 Jun 2015 20:44:34 +0000 (13:44 -0700)]
Add <sysexits.h>.
Taken from current upstream OpenBSD.
Bug: http://b/
22172963
Change-Id: Ic899e08541335777296fa8ec99e518f35a100144
Yusuke Sato [Mon, 29 Jun 2015 18:14:58 +0000 (18:14 +0000)]
am
71107cdd: Merge "Rename ZipEntryName to ZipString"
* commit '
71107cdd028461c433a39a10eb192edbdf03dede':
Rename ZipEntryName to ZipString
Yusuke Sato [Mon, 29 Jun 2015 17:49:28 +0000 (17:49 +0000)]
Merge "Rename ZipEntryName to ZipString"
egor.kochetov [Thu, 25 Jun 2015 13:52:36 +0000 (16:52 +0300)]
Fixed uchar.h for clang3.6
The NDK self-test issue64679-prctl failed to build because by default
clang3.6 builds in C11 mode, but the ifdef in the file 'uchar.h' hid the
required char16_t and char32_t declarations based on the GCC version,
which is declared as 4 by clang.
The ifdef is changed so that it is based on C version rather than a
compiler version. This way it is compatible with gcc 4, gcc 5 and clang
which are actually the only used toolchains.
See also: b.android.com/177609
Change-Id: I78c4bdc681c6f8a31b92dbe8ffe35e84ef2eda36
Signed-off-by: Egor Kochetov <egor.kochetov@intel.com>
Erik Kline [Thu, 25 Jun 2015 05:27:34 +0000 (14:27 +0900)]
Pass around struct android_net_context for better behaviour
Group network context elements in to a single struct and
add a version of android_getaddrinfofornet() that accepts it.
The introduction of UID-based routing means that the UID is an
integral part of the network context when evaluating connectivity,
sorting addresses, etc.
Also, introduce a distinction between DNS netids/marks and those
expected to be used by the application. This can be important
when the network an application is using is not the same as the
network on which DNS queries will be issued.
Additionally, de-duplicate the UDP connect logic (collapse both
_test_connect() and _find_src_addr() into just the latter).
Bug:
19470192
Bug:
20733156
Bug:
21832279
Change-Id: If16c2f4744695f507993afdac078ca105eb5d3e4
Dmitriy Ivanov [Fri, 26 Jun 2015 15:09:23 +0000 (15:09 +0000)]
am
06700b2b: Fix crash when trying to load invalid ELF file.
* commit '
06700b2b5e92a365505b15d0d05e2d5b0706c511':
Fix crash when trying to load invalid ELF file.
Dmitriy Ivanov [Fri, 26 Jun 2015 04:12:23 +0000 (04:12 +0000)]
am
eeb9f5e4: Merge "Fix crash when trying to load invalid ELF file."
* commit '
eeb9f5e41662828989f3913d81ec23229a668434':
Fix crash when trying to load invalid ELF file.
Dmitriy Ivanov [Fri, 26 Jun 2015 03:51:21 +0000 (03:51 +0000)]
Merge "Fix crash when trying to load invalid ELF file."
Dmitriy Ivanov [Thu, 25 Jun 2015 22:51:41 +0000 (15:51 -0700)]
Fix crash when trying to load invalid ELF file.
Bug: http://b/
22047255
Bug: http://b/
22091640
Change-Id: I6c51cff43287a6ac4b25fa9ce6a6fc3d232fd047
(cherry picked from commit
06700b2b5e92a365505b15d0d05e2d5b0706c511)
Dmitriy Ivanov [Thu, 25 Jun 2015 22:51:41 +0000 (15:51 -0700)]
Fix crash when trying to load invalid ELF file.
Bug: http://b/
22047255
Bug: http://b/
22091640
Change-Id: I6c51cff43287a6ac4b25fa9ce6a6fc3d232fd047
Yusuke Sato [Thu, 25 Jun 2015 21:56:07 +0000 (14:56 -0700)]
Rename ZipEntryName to ZipString
This is for https://android-review.googlesource.com/#/c/156771/.
Bug:
21957428
Change-Id: Ida30c28c0fff0b2dadddbdb1aa1999ae3250610b
Elliott Hughes [Thu, 25 Jun 2015 14:44:51 +0000 (14:44 +0000)]
am
d19c2715: Merge "Fix x86 gdbserver build."
* commit '
d19c271599a4b8881213c7bfbb81f87d8e56a101':
Fix x86 gdbserver build.
Elliott Hughes [Thu, 25 Jun 2015 14:30:21 +0000 (14:30 +0000)]
Merge "Fix x86 gdbserver build."
Dimitry Ivanov [Thu, 25 Jun 2015 01:24:07 +0000 (01:24 +0000)]
am
6589febe: Merge "[MIPS] Support FR=0 emulation on FR=1 64-bit FP registers"
* commit '
6589febec212bb1d72b7e3d593a1b7fe77692f7f':
[MIPS] Support FR=0 emulation on FR=1 64-bit FP registers
Dimitry Ivanov [Thu, 25 Jun 2015 01:02:18 +0000 (01:02 +0000)]
Merge "[MIPS] Support FR=0 emulation on FR=1 64-bit FP registers"
Elliott Hughes [Thu, 25 Jun 2015 00:31:24 +0000 (17:31 -0700)]
Fix x86 gdbserver build.
Add the x86-only elf_fpxregset_t to <sys/procfs.h>, and rename
user_fxsr_struct (the kernel's name) to user_fpxregs_struct (the
userspace name).
Bug: http://b/
22068064
Change-Id: Id466096bf02baf6bd49b193f49d9036848d33548
Duane Sand [Mon, 1 Jun 2015 23:29:14 +0000 (16:29 -0700)]
[MIPS] Support FR=0 emulation on FR=1 64-bit FP registers
Enables running of older MIPS NDK-built apps on mips64r6.
Works with kernel supporting FRE emulation, and old kernels.
Change-Id: If5e392ed89e9910cd1ccd30e0fd5c4a5acea2c7d
Dimitry Ivanov [Wed, 24 Jun 2015 21:47:39 +0000 (21:47 +0000)]
am
c666838a: Merge "Revert "[MIPS] Support FR=0 emulation on FR=1 64-bit FP registers""
* commit '
c666838ad6e578f429783a82f9b9a5bbddd3a9a8':
Revert "[MIPS] Support FR=0 emulation on FR=1 64-bit FP registers"
Dimitry Ivanov [Wed, 24 Jun 2015 21:09:43 +0000 (21:09 +0000)]
am
fb3357e2: Revert "[MIPS] Support FR=0 emulation on FR=1 64-bit FP registers"
* commit '
fb3357e2eb9366d87a8da96e1a0744c9b1f22af9':
Revert "[MIPS] Support FR=0 emulation on FR=1 64-bit FP registers"
Dimitry Ivanov [Wed, 24 Jun 2015 20:44:36 +0000 (20:44 +0000)]
Merge "Revert "[MIPS] Support FR=0 emulation on FR=1 64-bit FP registers""
Dimitry Ivanov [Wed, 24 Jun 2015 20:43:33 +0000 (20:43 +0000)]
Revert "[MIPS] Support FR=0 emulation on FR=1 64-bit FP registers"
This reverts commit
d02ec08427b006e80191ce60690ce48a788fb832.
Bug: http://b/
22045439
Change-Id: Iaf10ff1e2948083cce0098f29d5b87b32bfae1b7
Dimitry Ivanov [Wed, 24 Jun 2015 20:42:33 +0000 (20:42 +0000)]
Revert "[MIPS] Support FR=0 emulation on FR=1 64-bit FP registers"
This reverts commit
40d9e7bf842423e328cda58e21ff5fc0cbab5c8a.
Bug: http://b/
22045439
Change-Id: Ia9c56f65d35e404332a462f46460335cef39f0a4
Chih-Hung Hsieh [Wed, 24 Jun 2015 00:40:16 +0000 (00:40 +0000)]
am
d807b9a1: Merge "Use gcc to build and test x86_64 long double code."
* commit '
d807b9a12d3e49132b095df3d883618452033b51':
Use gcc to build and test x86_64 long double code.
Chih-Hung Hsieh [Wed, 24 Jun 2015 00:15:50 +0000 (00:15 +0000)]
Merge "Use gcc to build and test x86_64 long double code."
Chih-Hung Hsieh [Tue, 23 Jun 2015 21:18:14 +0000 (14:18 -0700)]
Use gcc to build and test x86_64 long double code.
Clang/llvm x86_64 configuration of long double is still
incompatible with gcc.
https://llvm.org/bugs/show_bug.cgi?id=23897
BUG:
21899249
Change-Id: I47fd6d0ce2daa84ae0035e7885a4d90e4c3056f7
Dmitriy Ivanov [Tue, 23 Jun 2015 22:17:08 +0000 (22:17 +0000)]
am
af6ee5b5: Merge "Work around compiler optimization"
* commit '
af6ee5b5bc446ef5a6f2bf41bc4f2e13657978be':
Work around compiler optimization
Dmitriy Ivanov [Tue, 23 Jun 2015 21:51:35 +0000 (21:51 +0000)]
Merge "Work around compiler optimization"
Dmitriy Ivanov [Tue, 23 Jun 2015 20:58:22 +0000 (13:58 -0700)]
Replace NULL with nullptr
Change-Id: If66d0c5ae1ea1ed371b44e067d4ae59ac54a8842
Dmitriy Ivanov [Tue, 23 Jun 2015 20:44:18 +0000 (13:44 -0700)]
Work around compiler optimization
This makes bionic-unit-test-glibc64 behave consistently
when testing dlopen from a library with dt_runpath.
Bug: http://b/
21899363
Change-Id: I9d446eb6852876975874d6b7761f6f81cc4e9916
Duane Sand [Tue, 23 Jun 2015 20:45:57 +0000 (20:45 +0000)]
am
40d9e7bf: [MIPS] Support FR=0 emulation on FR=1 64-bit FP registers
* commit '
40d9e7bf842423e328cda58e21ff5fc0cbab5c8a':
[MIPS] Support FR=0 emulation on FR=1 64-bit FP registers
Elliott Hughes [Tue, 23 Jun 2015 18:08:10 +0000 (18:08 +0000)]
Duane Sand [Mon, 1 Jun 2015 23:29:14 +0000 (16:29 -0700)]
[MIPS] Support FR=0 emulation on FR=1 64-bit FP registers
Enables running of older MIPS NDK-built apps on mips64r6.
Works with kernel supporting FRE emulation, and old kernels.
Bug: http://b/
21555893
Change-Id: I13923fe62cd83ad1d337f13a50f2eda2dfdd906f
(cherry picked from commit
d02ec08427b006e80191ce60690ce48a788fb832)
Elliott Hughes [Tue, 23 Jun 2015 16:14:16 +0000 (09:14 -0700)]
Fix bad merge of
64e9e71cdb7d88397e510e1986d494b797ed3b45.
Bug: http://b/
22029751
Change-Id: I6245fe5f274c9af8a632da5eebe50cf9fe29dc4a
Dmitriy Ivanov [Mon, 22 Jun 2015 19:51:19 +0000 (19:51 +0000)]
am
d6d6c0c4: Merge "Remove libdl* tests from bionic-unit-tests-static" into mnc-dev
* commit '
d6d6c0c4f10c047b25b45289f5c30338cd1da239':
Remove libdl* tests from bionic-unit-tests-static
Dmitriy Ivanov [Mon, 22 Jun 2015 19:51:18 +0000 (19:51 +0000)]
am
5fa858c5: Merge "Remove text-relocs support for apps targeting M+" into mnc-dev
* commit '
5fa858c5655ed721696719ce07d81a983d4b0f5e':
Remove text-relocs support for apps targeting M+
Dmitriy Ivanov [Mon, 22 Jun 2015 19:50:50 +0000 (19:50 +0000)]
am
a8993c99: Merge "Remove text-relocs support for apps targeting M+"
* commit '
a8993c994e45ec2dc00dcef15910560e22d67be9':
Remove text-relocs support for apps targeting M+
Dmitriy Ivanov [Mon, 22 Jun 2015 19:50:49 +0000 (19:50 +0000)]
am
13cee57d: Merge "Remove libdl* tests from bionic-unit-tests-static"
* commit '
13cee57dee4ebd14b57e7b5acd372228eb9c4a37':
Remove libdl* tests from bionic-unit-tests-static
Dmitriy Ivanov [Mon, 22 Jun 2015 19:27:34 +0000 (19:27 +0000)]
Merge "Remove text-relocs support for apps targeting M+"
Dmitriy Ivanov [Fri, 12 Jun 2015 22:00:31 +0000 (15:00 -0700)]
Remove text-relocs support for apps targeting M+
Remove support of text-relocations for apps targeting sdk version > 22
Bug: http://b/
20013628
Change-Id: I2127739544480c747315e32df15dfbd1b79de4f5
(cherry picked from commit
3e6f7807541bab8157f9c26e55829fd193683349)
Dmitriy Ivanov [Mon, 22 Jun 2015 19:25:36 +0000 (19:25 +0000)]
Merge "Remove libdl* tests from bionic-unit-tests-static" into mnc-dev
Dmitriy Ivanov [Mon, 22 Jun 2015 19:25:15 +0000 (19:25 +0000)]
Merge "Remove text-relocs support for apps targeting M+" into mnc-dev
Dmitriy Ivanov [Mon, 22 Jun 2015 18:54:58 +0000 (11:54 -0700)]
Remove libdl* tests from bionic-unit-tests-static
Bug: http://b/
21900592
Change-Id: I907cc15684b121ec2fbdeca49fc584bb6d2eaacc
(cherry picked from commit
de4e27e231143e4e1982b4ca9effd03c1ca12d86)
Dmitriy Ivanov [Mon, 22 Jun 2015 19:24:15 +0000 (19:24 +0000)]
Merge "Remove libdl* tests from bionic-unit-tests-static"
Dmitriy Ivanov [Mon, 22 Jun 2015 18:54:58 +0000 (11:54 -0700)]
Remove libdl* tests from bionic-unit-tests-static
Bug: http://b/
21900592
Change-Id: I907cc15684b121ec2fbdeca49fc584bb6d2eaacc
Dimitry Ivanov [Sun, 21 Jun 2015 21:46:39 +0000 (21:46 +0000)]
am
6a5ead69: Merge "[MIPS] Support FR=0 emulation on FR=1 64-bit FP registers"
* commit '
6a5ead6990ef16e858309928c4b14e3a5e2d89af':
[MIPS] Support FR=0 emulation on FR=1 64-bit FP registers
Dimitry Ivanov [Sun, 21 Jun 2015 21:25:53 +0000 (21:25 +0000)]
Merge "[MIPS] Support FR=0 emulation on FR=1 64-bit FP registers"
Duane Sand [Mon, 1 Jun 2015 23:29:14 +0000 (16:29 -0700)]
[MIPS] Support FR=0 emulation on FR=1 64-bit FP registers
Enables running of older MIPS NDK-built apps on mips64r6.
Works with kernel supporting FRE emulation, and old kernels.
Change-Id: I13923fe62cd83ad1d337f13a50f2eda2dfdd906f
Yabin Cui [Fri, 19 Jun 2015 20:29:49 +0000 (20:29 +0000)]
am
cb060759: am
8beb0c34: am
b245bc75: am
0f455612: Merge "Fix flaky test of timer_create_multiple in L." into lollipop-mr1-cts-dev
* commit '
cb0607590341ed2512a55015e66e19e7f7db3723':
Fix flaky test of timer_create_multiple in L.
David Srbecky [Fri, 19 Jun 2015 20:29:33 +0000 (20:29 +0000)]
am
c08c88b5: Merge "Add flag that makes linker honor min(p_vaddr)" into mnc-dev
* commit '
c08c88b5fcec05551858c32bc57f4ae614c0ce5c':
Add flag that makes linker honor min(p_vaddr)
Yabin Cui [Fri, 19 Jun 2015 19:06:22 +0000 (19:06 +0000)]
am
8beb0c34: am
b245bc75: am
0f455612: Merge "Fix flaky test of timer_create_multiple in L." into lollipop-mr1-cts-dev
* commit '
8beb0c34da46a5146a2de8256db8bb42febb283c':
Fix flaky test of timer_create_multiple in L.
Yabin Cui [Fri, 19 Jun 2015 18:55:51 +0000 (18:55 +0000)]
am
b245bc75: am
0f455612: Merge "Fix flaky test of timer_create_multiple in L." into lollipop-mr1-cts-dev
* commit '
b245bc750021ce6d220e71625fca66620cdd1f05':
Fix flaky test of timer_create_multiple in L.
Yabin Cui [Fri, 19 Jun 2015 18:40:59 +0000 (18:40 +0000)]
am
0f455612: Merge "Fix flaky test of timer_create_multiple in L." into lollipop-mr1-cts-dev
* commit '
0f455612d3325932a851418634a17a61307948c5':
Fix flaky test of timer_create_multiple in L.
David Srbecky [Fri, 19 Jun 2015 18:25:56 +0000 (18:25 +0000)]
Merge "Add flag that makes linker honor min(p_vaddr)" into mnc-dev
Yabin Cui [Fri, 19 Jun 2015 18:25:21 +0000 (18:25 +0000)]
am
6cc98af7: Merge "Don\'t use TIMER_ABSTIME in time_test."
* commit '
6cc98af72b0c48c58b2ab5fdb5f7abb842175299':
Don't use TIMER_ABSTIME in time_test.
Yabin Cui [Fri, 19 Jun 2015 18:00:52 +0000 (18:00 +0000)]
Merge "Fix flaky test of timer_create_multiple in L." into lollipop-mr1-cts-dev
Yabin Cui [Fri, 19 Jun 2015 17:56:51 +0000 (17:56 +0000)]
Merge "Don't use TIMER_ABSTIME in time_test."
Yabin Cui [Fri, 19 Jun 2015 00:01:11 +0000 (17:01 -0700)]
Don't use TIMER_ABSTIME in time_test.
If TIMER_ABSTIME is used in timer_settime(), the timer is always fired
immediately, which is not the intent of the tests.
Change-Id: I76047dbeb2bdded272ee6d028630b53bfd7d8514
Yabin Cui [Thu, 18 Jun 2015 23:19:02 +0000 (16:19 -0700)]
Fix flaky test of timer_create_multiple in L.
Bug:
20677618
Change-Id: I0cb5faf77edce042b10611543180f3e2e73d3d05
Dmitriy Ivanov [Sat, 6 Jun 2015 05:16:23 +0000 (22:16 -0700)]
Add flag that makes linker honor min(p_vaddr)
(cherry picked from commit
8a1162835597be38705b381ac34c07da17932568)
Bug:
21924613
Bug: http://b/
21523078
Change-Id: I3f944a08dd2ed1df4d8a807da4fee423fdd35eb7
Christopher Ferris [Thu, 18 Jun 2015 01:25:22 +0000 (18:25 -0700)]
resolved conflicts for merge of
7d6410e9 to mnc-dev-plus-aosp
Change-Id: I0f050e4eba3d68907dd6bfa24563f7ddfae1d73e
Dmitriy Ivanov [Thu, 18 Jun 2015 00:55:37 +0000 (00:55 +0000)]
am
547fa54e: Merge "Improve library lookup logic"
* commit '
547fa54e6d5342f4ce68c7d78bd270595caf4b97':
Improve library lookup logic
Dmitriy Ivanov [Thu, 18 Jun 2015 00:43:12 +0000 (17:43 -0700)]
resolved conflicts for merge of
28154f5c to mnc-dev-plus-aosp
Change-Id: I26d4a341d19b6ef1e430f5365626f3c274ba7320
Dmitriy Ivanov [Thu, 18 Jun 2015 00:30:47 +0000 (00:30 +0000)]
Merge "Improve library lookup logic"
Christopher Ferris [Thu, 18 Jun 2015 00:18:39 +0000 (00:18 +0000)]
Merge "[MIPS] Add optimized string functions" into mnc-dev
Dmitriy Ivanov [Tue, 16 Jun 2015 22:38:21 +0000 (15:38 -0700)]
Improve library lookup logic
Linker tries to open a library even if it can
be found by soname. This only happens if the
library was previously opened under different
target sdk version.
Bug: http://b/
21876587
Bug: http://b/
21153477
Bug: http://b/
21171302
Bug: https://code.google.com/p/android/issues/detail?id=160921
Change-Id: I7dbbcc3b49933bffd89ca0af55371e1a1f2bf4c2
(cherry picked from commit
28154f5c56dc4a64270cae2374b47a168d1bd7fa)
Christopher Ferris [Thu, 18 Jun 2015 00:15:29 +0000 (00:15 +0000)]
am
bfa601a9: Merge "[MIPS] Add optimized string functions"
* commit '
bfa601a9992547147fa66a95273bd5b891723bcc':
[MIPS] Add optimized string functions
Nikola Veljkovic [Tue, 26 May 2015 10:06:09 +0000 (12:06 +0200)]
[MIPS] Add optimized string functions
Use same string functions for all MIPS architectures.
Bug:
21555893
(cherry picked from commit
38f2eaa07b0ad2e01a40607d3a0ac240ff53abbf)
Change-Id: I94521f023d0bb136a4672782148a9f6e77cc6f1e
Christopher Ferris [Wed, 17 Jun 2015 23:50:55 +0000 (23:50 +0000)]
Merge "[MIPS] Add optimized string functions"
Dmitriy Ivanov [Tue, 16 Jun 2015 22:38:21 +0000 (15:38 -0700)]
Improve library lookup logic
Linker tries to open a library even if it can
be found by soname. This only happens if the
library was previously opened under different
target sdk version.
Bug: http://b/
21876587
Bug: http://b/
21153477
Bug: http://b/
21171302
Bug: https://code.google.com/p/android/issues/detail?id=160921
Change-Id: I7dbbcc3b49933bffd89ca0af55371e1a1f2bf4c2
Dimitry Ivanov [Wed, 17 Jun 2015 21:57:17 +0000 (21:57 +0000)]
am
9ae6f794: Merge "Revert "Improve library lookup logic""
* commit '
9ae6f794cae7280385dfa172b12b7bd110f24693':
Revert "Improve library lookup logic"
Dimitry Ivanov [Wed, 17 Jun 2015 21:35:27 +0000 (21:35 +0000)]
Merge "Revert "Improve library lookup logic""