OSDN Git Service
Josh Gao [Fri, 22 Jul 2016 19:36:07 +0000 (19:36 +0000)]
Merge changes I7718b1ba,I648adc35 am:
4f62c5b311 am:
ba03502f56 am:
4f1d68f463
am:
f0a1858137
Change-Id: Ib71b4c25ad73b9ff7eb9d478500bcf65a7b5627a
Josh Gao [Fri, 22 Jul 2016 19:33:36 +0000 (19:33 +0000)]
Merge changes I7718b1ba,I648adc35 am:
4f62c5b311 am:
ba03502f56
am:
4f1d68f463
Change-Id: I7ca016308d6d77e3a71a0944304e9424c9dd25e0
Josh Gao [Fri, 22 Jul 2016 19:31:06 +0000 (19:31 +0000)]
Merge changes I7718b1ba,I648adc35 am:
4f62c5b311
am:
ba03502f56
Change-Id: I6f3589befd901b4b7485f0e682e0bb9b26b44190
Josh Gao [Fri, 22 Jul 2016 19:28:38 +0000 (19:28 +0000)]
Merge changes I7718b1ba,I648adc35
am:
4f62c5b311
Change-Id: Ia117c90c75866c0672cbdc0f0fa34975e58b2b0f
Treehugger Robot [Fri, 22 Jul 2016 19:20:58 +0000 (19:20 +0000)]
Merge changes I7718b1ba,I648adc35
* changes:
Only initialize the global stack protector once.
Make getpid work before TLS has been initialized.
Elliott Hughes [Fri, 22 Jul 2016 00:46:50 +0000 (00:46 +0000)]
Merge \\\\"Only define sa_family_t once.\\\\" am:
237366867a am:
f3a094a4ea am:
fd8843fc88
am:
6c2f1779b0
Change-Id: If094b16fba5435b98874d2426d950d33cff2bd43
Elliott Hughes [Fri, 22 Jul 2016 00:44:13 +0000 (00:44 +0000)]
Merge \\\"Only define sa_family_t once.\\\" am:
237366867a am:
f3a094a4ea
am:
fd8843fc88
Change-Id: I227fca769e2af22dc8aab09af6f0795d92fc6170
Elliott Hughes [Fri, 22 Jul 2016 00:41:43 +0000 (00:41 +0000)]
Merge \\"Only define sa_family_t once.\\" am:
237366867a
am:
f3a094a4ea
Change-Id: Ifaf33d50facd007d14696d3f0efdc225e43a518e
Elliott Hughes [Fri, 22 Jul 2016 00:39:14 +0000 (00:39 +0000)]
Merge \"Only define sa_family_t once.\"
am:
237366867a
Change-Id: Ifef06cfc6a9ee7d5d681f9886408d4c436a6fe32
Treehugger Robot [Fri, 22 Jul 2016 00:28:18 +0000 (00:28 +0000)]
Merge "Only define sa_family_t once."
Elliott Hughes [Thu, 21 Jul 2016 23:38:43 +0000 (16:38 -0700)]
Only define sa_family_t once.
Change-Id: Icf700910c836d22c8a27ad026ec8af11697edd5a
Elliott Hughes [Thu, 21 Jul 2016 08:22:29 +0000 (08:22 +0000)]
Merge \\\\"Treat \\\\"persist.sys.timezone\\\\" as being a Java-format timezone.\\\\" am:
91f33cd5ae am:
e81e3d5523 am:
34fcf7ca8b
am:
c461f691c1
Change-Id: I2ee2444b48bcee1d0c5edcaf771761b4c22a2fb9
Elliott Hughes [Thu, 21 Jul 2016 08:19:29 +0000 (08:19 +0000)]
Merge \\\"Treat \\\"persist.sys.timezone\\\" as being a Java-format timezone.\\\" am:
91f33cd5ae am:
e81e3d5523
am:
34fcf7ca8b
Change-Id: I3e7163daf6adc2c59c63d95688b556390bd85059
Elliott Hughes [Thu, 21 Jul 2016 08:16:59 +0000 (08:16 +0000)]
Merge \\"Treat \\"persist.sys.timezone\\" as being a Java-format timezone.\\" am:
91f33cd5ae
am:
e81e3d5523
Change-Id: I8a657509a13290d138cea660f3920f38adb42ccc
Elliott Hughes [Thu, 21 Jul 2016 08:14:31 +0000 (08:14 +0000)]
Merge \"Treat \"persist.sys.timezone\" as being a Java-format timezone.\"
am:
91f33cd5ae
Change-Id: Iafd50c6b6b44166f2fdf1506dbcbe5c788568966
Treehugger Robot [Thu, 21 Jul 2016 08:06:33 +0000 (08:06 +0000)]
Merge "Treat "persist.sys.timezone" as being a Java-format timezone."
Dimitry Ivanov [Thu, 21 Jul 2016 02:17:07 +0000 (02:17 +0000)]
resolve merge conflicts of
823e32e to stage-aosp-master am:
1750ab4e21 am:
cf02165ee3
am:
5bbe259b28
Change-Id: Ibf4d6aa2f7e60a54ca665fea34070e197975ff5c
Christopher Ferris [Thu, 21 Jul 2016 02:14:06 +0000 (02:14 +0000)]
resolve merge conflicts of
823e32e to stage-aosp-master am:
1750ab4e21
am:
cf02165ee3
Change-Id: I3c9ff3f8992d3a8d36e6c45e3526107796b95cec
Dimitry Ivanov [Thu, 21 Jul 2016 02:11:06 +0000 (02:11 +0000)]
resolve merge conflicts of
823e32e to stage-aosp-master
am:
1750ab4e21
Change-Id: I2abd8e1b0ea8a2ae0898b91f6d0cb87b885a47d9
Christopher Ferris [Thu, 21 Jul 2016 01:19:06 +0000 (18:19 -0700)]
resolve merge conflicts of
823e32e to stage-aosp-master
Change-Id: I93911e76d85f55d9105c1349cd919dc924fbd5e4
Elliott Hughes [Thu, 21 Jul 2016 00:23:54 +0000 (17:23 -0700)]
Treat "persist.sys.timezone" as being a Java-format timezone.
POSIX and Java disagree about the sign in a timezone string like "GMT+3".
This means that if you set "persist.sys.timezone" to such a string, native
code and Java code disagree about what time it is. Resolve this by
translating to POSIX form for native code.
Bug: http://b/
25463955
Change-Id: I7c08c459dd8514348a12ce419edcbfbfe8f6d327
Test: manually tested with setprop and date.
Dimitry Ivanov [Thu, 21 Jul 2016 00:08:46 +0000 (00:08 +0000)]
Merge "Pass argc/argv/envp to dso constructors"
Dimitry Ivanov [Wed, 20 Jul 2016 22:33:07 +0000 (15:33 -0700)]
Pass argc/argv/envp to dso constructors
The glibc implementation of the loader passes argc/argv/envp
to all elf constructors. This change makes bionic linker
behave in the same way.
Bug: http://b/
30145768
Change-Id: I1c65c42aa5305a5b133c64b5748205bbde869e0e
Test: run bionic-unit-tests --gtest_filter=dl*:Dl*
Evgenii Stepanov [Wed, 20 Jul 2016 20:46:17 +0000 (20:46 +0000)]
Merge \\\\"Align-up and randomize shared libraries.\\\\" am:
a9fbaee593 am:
2f5ed30a7c am:
960e5131f7
am:
3ca9b1516d
Change-Id: I7dc9b9e7dfc769c6d6b60234c2b670836dc6bd4b
Evgenii Stepanov [Wed, 20 Jul 2016 20:42:53 +0000 (20:42 +0000)]
Merge \\\"Align-up and randomize shared libraries.\\\" am:
a9fbaee593 am:
2f5ed30a7c
am:
960e5131f7
Change-Id: I182bb5e5ce0f1cc89922afcf81f41ef1178309e6
Evgenii Stepanov [Wed, 20 Jul 2016 20:40:24 +0000 (20:40 +0000)]
Merge \\"Align-up and randomize shared libraries.\\" am:
a9fbaee593
am:
2f5ed30a7c
Change-Id: I6b3395fa332645f6ee8bf2a77ea5df99557e45c7
Evgenii Stepanov [Wed, 20 Jul 2016 20:37:26 +0000 (20:37 +0000)]
Merge \"Align-up and randomize shared libraries.\"
am:
a9fbaee593
Change-Id: I5cb0caea4db3a8cb3b0e1a4dd3a4bb2d5f5069d9
Evgenii Stepanov [Wed, 20 Jul 2016 20:31:41 +0000 (20:31 +0000)]
Merge "Align-up and randomize shared libraries."
Christopher Ferris [Wed, 20 Jul 2016 18:32:05 +0000 (18:32 +0000)]
Merge \\\\"Move/remove android only kernel uapi headers.\\\\" am:
fe280773ed am:
fa46052743 am:
12f642be61
am:
da243a3cef
Change-Id: Ia1de37666fb47d2687045e8c3f1dc714333ddff6
Christopher Ferris [Wed, 20 Jul 2016 18:25:58 +0000 (18:25 +0000)]
Merge \\\"Move/remove android only kernel uapi headers.\\\" am:
fe280773ed am:
fa46052743
am:
12f642be61
Change-Id: I36462ad0c83ba88a1e11eec95360aec0754163da
Christopher Ferris [Wed, 20 Jul 2016 18:17:34 +0000 (18:17 +0000)]
Merge \\"Move/remove android only kernel uapi headers.\\" am:
fe280773ed
am:
fa46052743
Change-Id: Ic2bd319337384638d9d25b462e367bd8756764c7
Christopher Ferris [Wed, 20 Jul 2016 18:09:38 +0000 (18:09 +0000)]
Merge \"Move/remove android only kernel uapi headers.\"
am:
fe280773ed
Change-Id: If9de2352e7522628aff751211753c11d4d453ca8
Christopher Ferris [Wed, 20 Jul 2016 18:03:47 +0000 (18:03 +0000)]
Merge "Move/remove android only kernel uapi headers."
Evgenii Stepanov [Fri, 15 Jul 2016 23:31:42 +0000 (16:31 -0700)]
Align-up and randomize shared libraries.
This change implements the following property:
Any 2**N aligned memory region on size 2**N contains no more than one DSO.
The value N can be configured, with 16 or 18 looking like a good choice.
Additionally, DSOs are loaded at random page-aligned address inside these large
regions.
This change has dual purpose:
1. Larger values of N allow a lot more compact CFI shadow implementation.
See change I14dfea630de468eb5620e7f55f92b1397ba06217.
For example, CFI shadow for the system_server process has the following size (RSS, KB):
152 for N = 12, 32 for N = 16, 16 for N = 18.
2. Extra randomization is good for security.
This change does not result in extra RAM usage, because everything is still page-aligned.
It does result in a bit more VM fragmentation because of the gaps between shared libraries.
As it turns out, this fragmentation is barely noticeable because the kernel creates new mapping
at the highest possible address, and we do enough small mappings to almost completely fill the
gaps (ex. in the Zygote the gaps are filled with .ttf file mappings and thread stacks).
I've measured VM fragmentation as the sum of all VM gaps (unmapped regions) that are larger
than 1MB according to /proc/$PID/maps. On aosp_angler-userdebug, the numbers are (in GB):
| N = 12 | N = 18
system_server | 521.9 | 521.1
zygote64 | 522.1 | 521.3
zygote32 | 2.55 | 2.55
mediaserver | 4.00 | 4.00
Change-Id: Ia6df840dd409c82837efd1f263be420d9723c84a
Elliott Hughes [Tue, 19 Jul 2016 22:08:45 +0000 (22:08 +0000)]
Merge \\\\"Expand the testing docs slightly.\\\\" am:
d941f72e75 am:
9f9d4caf3c am:
d6d55b1d0e
am:
3522745b0c
Change-Id: If255aeaaff13815050978c0f3758001dd5e34a6a
Elliott Hughes [Tue, 19 Jul 2016 22:06:30 +0000 (22:06 +0000)]
Merge \\\\"Remove __LIBC_ABI_PUBLIC__.\\\\" am:
9af76f9b48 am:
234c0f6bb6 am:
20d7c08b60
am:
4e1a6aefd7
Change-Id: I628c6215d67d26ed6a3ab6a36ceaa1679bec3ffa
Elliott Hughes [Tue, 19 Jul 2016 22:06:15 +0000 (22:06 +0000)]
Merge \\\"Expand the testing docs slightly.\\\" am:
d941f72e75 am:
9f9d4caf3c
am:
d6d55b1d0e
Change-Id: If2e5788a3a37ae0d4dfa95cad5bc71f3c1a40c79
Elliott Hughes [Tue, 19 Jul 2016 22:03:17 +0000 (22:03 +0000)]
Merge \\"Expand the testing docs slightly.\\" am:
d941f72e75
am:
9f9d4caf3c
Change-Id: Ibcefc8a9b95957583d8991cb7e6aec42561889db
Elliott Hughes [Tue, 19 Jul 2016 22:03:15 +0000 (22:03 +0000)]
Merge \\\"Remove __LIBC_ABI_PUBLIC__.\\\" am:
9af76f9b48 am:
234c0f6bb6
am:
20d7c08b60
Change-Id: I0752e049e2b2f169d1a55befaf509d6a27acefed
Elliott Hughes [Tue, 19 Jul 2016 22:00:46 +0000 (22:00 +0000)]
Merge \"Expand the testing docs slightly.\"
am:
d941f72e75
Change-Id: I9ad64b2f4b1af867b422af7a558338d1224823aa
Elliott Hughes [Tue, 19 Jul 2016 22:00:45 +0000 (22:00 +0000)]
Merge \\"Remove __LIBC_ABI_PUBLIC__.\\" am:
9af76f9b48
am:
234c0f6bb6
Change-Id: I3cf9c2859c2a3e0c57bc24cf44a96a8ee22d8931
Elliott Hughes [Tue, 19 Jul 2016 21:58:19 +0000 (21:58 +0000)]
Merge \"Remove __LIBC_ABI_PUBLIC__.\"
am:
9af76f9b48
Change-Id: I8e2e7bf6a70f978619499a0e96e424c6bdb1cdf0
Treehugger Robot [Tue, 19 Jul 2016 21:57:27 +0000 (21:57 +0000)]
Merge "Expand the testing docs slightly."
Treehugger Robot [Tue, 19 Jul 2016 21:48:25 +0000 (21:48 +0000)]
Merge "Remove __LIBC_ABI_PUBLIC__."
Elliott Hughes [Tue, 19 Jul 2016 21:09:10 +0000 (14:09 -0700)]
Expand the testing docs slightly.
Change-Id: I4b172eefd8f456a62b24520a9f04f500a1d6bc85
Elliott Hughes [Tue, 19 Jul 2016 20:56:46 +0000 (13:56 -0700)]
Remove __LIBC_ABI_PUBLIC__.
We have much better control over visibility now, so we don't need to
pollute the headers with cruft.
Bug: http://b/
24767418
Change-Id: I349f4c3bc30102477375ad9f80926e560c7c1d8b
Christopher Ferris [Mon, 18 Jul 2016 23:27:22 +0000 (16:27 -0700)]
Move/remove android only kernel uapi headers.
Move all of the uapi kernel headers that are only found in the android
kernel, and are still used by the tree into their own directory.
Delete all of these files that are not used.
Also, delete binder.h from the linux directory since it already exists
in the linux/android directory.
Bug:
30072483
Change-Id: I879f16e366f7670b8be3546b0a9cf9567fce6526
Elliott Hughes [Tue, 19 Jul 2016 18:18:56 +0000 (18:18 +0000)]
Merge \\\\"Add a test for a known kernel bug.\\\\" am:
061cf180db am:
a2487be0c7 am:
d151b7505e
am:
e227492f79
Change-Id: I4e34d982c344022966ea6b755b0f64960eb9935e
Elliott Hughes [Tue, 19 Jul 2016 18:15:56 +0000 (18:15 +0000)]
Merge \\\"Add a test for a known kernel bug.\\\" am:
061cf180db am:
a2487be0c7
am:
d151b7505e
Change-Id: Ic3ac405a7926d871311222ec8645b0573f2fb810
Elliott Hughes [Tue, 19 Jul 2016 18:13:26 +0000 (18:13 +0000)]
Merge \\"Add a test for a known kernel bug.\\" am:
061cf180db
am:
a2487be0c7
Change-Id: I54a33582078f8da658986aff13d8dc2163aaa149
Elliott Hughes [Tue, 19 Jul 2016 18:10:58 +0000 (18:10 +0000)]
Merge \"Add a test for a known kernel bug.\"
am:
061cf180db
Change-Id: I31af9c357077b932157eef80f3c51c96750986ab
Treehugger Robot [Tue, 19 Jul 2016 17:52:03 +0000 (17:52 +0000)]
Merge "Add a test for a known kernel bug."
Elliott Hughes [Mon, 18 Jul 2016 20:59:19 +0000 (20:59 +0000)]
Merge \\\\"Don\\\\'t declare SYS_* constants for unavailable __NR_* constants.\\\\" am:
20de9ef5bd am:
1b2b8362c9 am:
36edfa0260
am:
8f326adfab
Change-Id: I3e0b915f828f7e3438986f3e97f1fcce28ad2760
Elliott Hughes [Mon, 18 Jul 2016 20:55:49 +0000 (20:55 +0000)]
Merge \\\"Don\\\'t declare SYS_* constants for unavailable __NR_* constants.\\\" am:
20de9ef5bd am:
1b2b8362c9
am:
36edfa0260
Change-Id: Ic2fc7cbae83a207b3409f9d3fcd47df97ff76be1
Elliott Hughes [Mon, 18 Jul 2016 20:52:19 +0000 (20:52 +0000)]
Merge \\"Don\\'t declare SYS_* constants for unavailable __NR_* constants.\\" am:
20de9ef5bd
am:
1b2b8362c9
Change-Id: I38820757a6a083f7010a1e94d053372d99401c8c
Elliott Hughes [Mon, 18 Jul 2016 20:48:52 +0000 (20:48 +0000)]
Merge \"Don\'t declare SYS_* constants for unavailable __NR_* constants.\"
am:
20de9ef5bd
Change-Id: Ib9e6ef7fc06df0ac42414870061da287a9692d09
Treehugger Robot [Mon, 18 Jul 2016 20:39:10 +0000 (20:39 +0000)]
Merge "Don't declare SYS_* constants for unavailable __NR_* constants."
Elliott Hughes [Fri, 15 Jul 2016 22:47:47 +0000 (15:47 -0700)]
Don't declare SYS_* constants for unavailable __NR_* constants.
Bug: https://code.google.com/p/android/issues/detail?id=215853
Change-Id: Iaaa3ce888deb8d032208bf636b7badaed6a72d30
Colin Cross [Fri, 15 Jul 2016 23:58:38 +0000 (23:58 +0000)]
Merge \\\"resolve merge conflicts of
cf85fd5 to stage-aosp-master\\\" into stage-aosp-master am:
22d5ddcb95 am:
f6e9894d18
am:
56b756661a
Change-Id: I957a2d3d707e8df0e21d22eb239e8bc729a4ff23
Colin Cross [Fri, 15 Jul 2016 23:58:37 +0000 (23:58 +0000)]
resolve merge conflicts of
cf85fd5 to stage-aosp-master am:
476950d104 am:
fa3572cdec
am:
b6289b56bb
Change-Id: I724b6fab88c11d4e2c768ce6423044234a925c3e
Colin Cross [Fri, 15 Jul 2016 23:56:40 +0000 (23:56 +0000)]
Merge \\"resolve merge conflicts of
cf85fd5 to stage-aosp-master\\" into stage-aosp-master am:
22d5ddcb95
am:
f6e9894d18
Change-Id: I70de85907bf2296fefde333cdd8c9ac1a690514b
Dimitry Ivanov [Fri, 15 Jul 2016 23:56:36 +0000 (23:56 +0000)]
resolve merge conflicts of
cf85fd5 to stage-aosp-master am:
476950d104
am:
fa3572cdec
Change-Id: I90a42442372475d6171ed7ab99be70b392ff8ae8
Colin Cross [Fri, 15 Jul 2016 23:53:39 +0000 (23:53 +0000)]
Merge \"resolve merge conflicts of
cf85fd5 to stage-aosp-master\" into stage-aosp-master
am:
22d5ddcb95
Change-Id: Ibb4f21faff2701b6ebc1e47154a8880dc3084dae
Colin Cross [Fri, 15 Jul 2016 23:53:37 +0000 (23:53 +0000)]
resolve merge conflicts of
cf85fd5 to stage-aosp-master
am:
476950d104
Change-Id: I9663cbb46481cc026728a0ada38b061a3260dba1
TreeHugger Robot [Fri, 15 Jul 2016 23:51:04 +0000 (23:51 +0000)]
Merge "resolve merge conflicts of
cf85fd5 to stage-aosp-master" into stage-aosp-master
Dimitry Ivanov [Fri, 15 Jul 2016 23:49:14 +0000 (16:49 -0700)]
resolve merge conflicts of
cf85fd5 to stage-aosp-master
Change-Id: Id73b6e03a224ce9a3e3838731be24a16692ef6e0
Colin Cross [Fri, 15 Jul 2016 22:49:51 +0000 (15:49 -0700)]
resolve merge conflicts of
cf85fd5 to stage-aosp-master
Change-Id: I29bb554c9469109f999c6921e169625ad52cc515
Treehugger Robot [Fri, 15 Jul 2016 22:31:13 +0000 (22:31 +0000)]
Merge "Convert linker from Android.mk to Android.bp"
Dan Albert [Fri, 15 Jul 2016 22:16:04 +0000 (22:16 +0000)]
Merge \\\\"Put the legacy stdio fds back for pre-M.\\\\" am:
098d8ef5b2 am:
548d8e0374 am:
bba8702d7a
am:
ade06ff924
Change-Id: I3cc16409169d94e3568908288bc9ea54f36a53a3
Dan Albert [Fri, 15 Jul 2016 21:53:28 +0000 (21:53 +0000)]
Merge \\\"Put the legacy stdio fds back for pre-M.\\\" am:
098d8ef5b2 am:
548d8e0374
am:
bba8702d7a
Change-Id: I2c8b8a793f8f80f508d3056074a2c56185632cbc
Dan Albert [Fri, 15 Jul 2016 21:50:58 +0000 (21:50 +0000)]
Merge \\"Put the legacy stdio fds back for pre-M.\\" am:
098d8ef5b2
am:
548d8e0374
Change-Id: I26ca792199009a338c95414783470d9e77afa2b2
Dan Albert [Fri, 15 Jul 2016 21:48:30 +0000 (21:48 +0000)]
Merge \"Put the legacy stdio fds back for pre-M.\"
am:
098d8ef5b2
Change-Id: I32565181dcfc9caab8212baa1c3f7a03f490ce0d
Treehugger Robot [Fri, 15 Jul 2016 21:33:00 +0000 (21:33 +0000)]
Merge "Put the legacy stdio fds back for pre-M."
Dan Albert [Fri, 15 Jul 2016 21:16:17 +0000 (21:16 +0000)]
Merge \\\\"Add an alias for _CTYPE_N.\\\\" am:
730fa648c2 am:
32d7ca35ec am:
4fee863475
am:
a6622e8aea
Change-Id: Ic4ddb6db9146ccae76dbf5ade07c3ad76b47923c
Dan Albert [Fri, 15 Jul 2016 21:08:53 +0000 (21:08 +0000)]
Merge \\\"Add an alias for _CTYPE_N.\\\" am:
730fa648c2 am:
32d7ca35ec
am:
4fee863475
Change-Id: I5640bd451661e19097e1418dc17bc9eea29e8c47
Dan Albert [Fri, 15 Jul 2016 21:05:23 +0000 (21:05 +0000)]
Merge \\"Add an alias for _CTYPE_N.\\" am:
730fa648c2
am:
32d7ca35ec
Change-Id: I68f304c9160874cd6e4f99470338f86b7a3d276f
Dan Albert [Fri, 15 Jul 2016 21:02:25 +0000 (21:02 +0000)]
Merge \"Add an alias for _CTYPE_N.\"
am:
730fa648c2
Change-Id: I84e7abe390146bfb2deb0987ccd997fd11c7d6aa
Treehugger Robot [Fri, 15 Jul 2016 20:56:01 +0000 (20:56 +0000)]
Merge "Add an alias for _CTYPE_N."
Colin Cross [Thu, 14 Jul 2016 23:05:46 +0000 (16:05 -0700)]
Convert linker from Android.mk to Android.bp
Change-Id: Ibf7da301defb2fd7e24fb3f4cd2e967a8f376497
Dan Albert [Fri, 15 Jul 2016 18:32:23 +0000 (11:32 -0700)]
Put the legacy stdio fds back for pre-M.
Change-Id: I2e397b04cba2969b9f9a3767b9b2fd12a289fcd2
Dan Albert [Fri, 15 Jul 2016 18:31:11 +0000 (11:31 -0700)]
Add an alias for _CTYPE_N.
gnustl is using this. It would be easy to change gnustl to *not* use
it for Android, but we've had this in released NDKs for years now so
we probably need this anyway.
Change-Id: I398a550664bf4ccbd9ea54f53c65428293a599a4
Yabin Cui [Fri, 15 Jul 2016 19:26:58 +0000 (19:26 +0000)]
Force pthread_cond_timedwait_relative_np using CLOCK_MONOTONIC. am:
a36b574011
am:
29f5a7c437
Change-Id: If8c305e16d130e27ee94b4d7072521928b4f19f0
Yabin Cui [Fri, 15 Jul 2016 19:16:46 +0000 (19:16 +0000)]
Force pthread_cond_timedwait_relative_np using CLOCK_MONOTONIC.
am:
a36b574011
Change-Id: I04081491fd2c3db90396136c8aa4aaef2da80840
Yabin Cui [Fri, 15 Jul 2016 01:47:14 +0000 (01:47 +0000)]
Merge \\\\"Force pthread_cond_timedwait_relative_np using CLOCK_MONOTONIC.\\\\" am:
a24a2476d0 am:
cd165f63c2 am:
ab3ac95ba5
am:
be4bf64a88
Change-Id: If39d23fa4a439cdadc3d162bb87d1dfe065405f8
Yabin Cui [Fri, 15 Jul 2016 01:44:52 +0000 (01:44 +0000)]
Merge \\\"Force pthread_cond_timedwait_relative_np using CLOCK_MONOTONIC.\\\" am:
a24a2476d0 am:
cd165f63c2
am:
ab3ac95ba5
Change-Id: I8c9b50a33dc834d9491124937e95883e8b1d43af
Yabin Cui [Fri, 15 Jul 2016 01:42:11 +0000 (01:42 +0000)]
Merge \\"Force pthread_cond_timedwait_relative_np using CLOCK_MONOTONIC.\\" am:
a24a2476d0
am:
cd165f63c2
Change-Id: I2894b396e8dfd309a21eac2fc2c68bcb265ebce1
Yabin Cui [Fri, 15 Jul 2016 01:39:12 +0000 (01:39 +0000)]
Merge \"Force pthread_cond_timedwait_relative_np using CLOCK_MONOTONIC.\"
am:
a24a2476d0
Change-Id: I5d1ebca87932f915fc33dd44d3b383e83b940d90
Yabin Cui [Wed, 13 Jul 2016 22:53:25 +0000 (15:53 -0700)]
Force pthread_cond_timedwait_relative_np using CLOCK_MONOTONIC.
Previous patch changed pthread_cond_timedwait_relative_np to use
CLOCK_REALTIME, which causes app compatibility problem. So change
it back to CLOCK_MONOTONIC.
Bug:
30106240
Change-Id: I8e04058e92ede098f4f9f8d133f094001921441e
(cherry picked from commit
fe4a4d8f67cf84b0b10d6c689f356229e057603b)
Yabin Cui [Fri, 15 Jul 2016 01:29:28 +0000 (01:29 +0000)]
Merge "Force pthread_cond_timedwait_relative_np using CLOCK_MONOTONIC."
Colin Cross [Fri, 15 Jul 2016 01:09:41 +0000 (01:09 +0000)]
Merge \\\\"Fix clean mma in bionic\\\\" am:
1e4a945f27 am:
14bef04838 am:
1a29a01213
am:
e6852272dc
Change-Id: I2ebb423e818eae209892a57f9be7f281c02c8c7f
Colin Cross [Fri, 15 Jul 2016 01:06:49 +0000 (01:06 +0000)]
Merge \\\"Fix clean mma in bionic\\\" am:
1e4a945f27 am:
14bef04838
am:
1a29a01213
Change-Id: Ifa2e0b161b0f63d6b16ee808dbcd63a16c908c2d
Colin Cross [Fri, 15 Jul 2016 01:04:08 +0000 (01:04 +0000)]
Merge \\"Fix clean mma in bionic\\" am:
1e4a945f27
am:
14bef04838
Change-Id: I0aa661c0ef65ca8eb763347c29c24fa122c847df
Colin Cross [Fri, 15 Jul 2016 01:00:44 +0000 (01:00 +0000)]
Merge \"Fix clean mma in bionic\"
am:
1e4a945f27
Change-Id: Ie6e69b74c7c1fa044db5e6eed58981ef0d57af28
Treehugger Robot [Fri, 15 Jul 2016 00:52:37 +0000 (00:52 +0000)]
Merge "Fix clean mma in bionic"
Elliott Hughes [Fri, 15 Jul 2016 00:07:17 +0000 (17:07 -0700)]
Add a test for a known kernel bug.
Bug: http://b/
27265969
Change-Id: I981cb6a91015bd17d362987ed12c8ca638987c5b
Colin Cross [Thu, 14 Jul 2016 23:53:18 +0000 (16:53 -0700)]
Fix clean mma in bionic
Change-Id: If2410c5ff9c08372098e5ec831e33e4da0e04b30
Colin Cross [Thu, 14 Jul 2016 21:19:38 +0000 (21:19 +0000)]
Merge \\\\"Convert bionic benchmarks and tests to Android.bp\\\\" am:
55653cc33b am:
2d61b5bc3a am:
6de6d43cd3
am:
e6ae372c11
Change-Id: I737b3bce2b394b61ea00e6557949998182ee95e0
Colin Cross [Thu, 14 Jul 2016 21:16:21 +0000 (21:16 +0000)]
Merge \\\"Convert bionic benchmarks and tests to Android.bp\\\" am:
55653cc33b am:
2d61b5bc3a
am:
6de6d43cd3
Change-Id: I9c826c1eb0c20f21eff250c34a300547acb968e2
Colin Cross [Thu, 14 Jul 2016 21:13:52 +0000 (21:13 +0000)]
Merge \\"Convert bionic benchmarks and tests to Android.bp\\" am:
55653cc33b
am:
2d61b5bc3a
Change-Id: Idaa5a2b6294e9b6ac8671812219c09e321443a15
Colin Cross [Thu, 14 Jul 2016 21:11:23 +0000 (21:11 +0000)]
Merge \"Convert bionic benchmarks and tests to Android.bp\"
am:
55653cc33b
Change-Id: I577eb6db457bfbc520ca4528315715674173c489
OSDN Git Service
