Chad Brubaker
efe4461364
am b9e1688c: am 1d3d0360: am 081db840: Allow overlap in resolv uid => DNS iface mapping
...
* commit 'b9e1688cd9f8727bbe0dacafd194c7a571bedb14':
Allow overlap in resolv uid => DNS iface mapping
2014-03-24 19:35:17 +00:00
Mark Salyzyn
248f1027e0
am 5b3c6fde: am cce6c380: Merge "libc: Thread IDs missing from logcat -v thread"
...
* commit '5b3c6fde09f2665f788f2586c3cdbab28b98b229':
libc: Thread IDs missing from logcat -v thread
2014-03-24 18:44:03 +00:00
Christopher Ferris
7eec583445
am e1b25377: am 998d7b03: Merge "Fix deadlock in timer_delete."
...
* commit 'e1b25377387376932688bb436393764469af1cf3':
Fix deadlock in timer_delete.
2014-03-24 17:27:10 +00:00
Calin Juravle
20f78d7eec
am 989a80b7: Merge "Fix LP64 libm for 128-bit long doubles"
...
* commit '989a80b75014eff71600a6a4e1445e710c2f94b4':
Fix LP64 libm for 128-bit long doubles
2014-03-24 12:33:51 +00:00
Calin Juravle
02a1787738
am 9e8a8dc1: Merge "Remove ALIGNBYTES and ALIGN from <sys/param.h>"
...
* commit '9e8a8dc18cb3162858feef2d4baaf3fa357aa3d2':
Remove ALIGNBYTES and ALIGN from <sys/param.h>
2014-03-24 12:33:50 +00:00
Calin Juravle
8a9d5db263
am 989a80b7: Merge "Fix LP64 libm for 128-bit long doubles"
...
* commit '989a80b75014eff71600a6a4e1445e710c2f94b4':
Fix LP64 libm for 128-bit long doubles
2014-03-24 12:33:41 +00:00
Calin Juravle
0839b2ba28
am 9e8a8dc1: Merge "Remove ALIGNBYTES and ALIGN from <sys/param.h>"
...
* commit '9e8a8dc18cb3162858feef2d4baaf3fa357aa3d2':
Remove ALIGNBYTES and ALIGN from <sys/param.h>
2014-03-24 12:33:40 +00:00
Calin Juravle
989a80b750
Merge "Fix LP64 libm for 128-bit long doubles"
2014-03-24 12:13:24 +00:00
Calin Juravle
9e8a8dc18c
Merge "Remove ALIGNBYTES and ALIGN from <sys/param.h>"
2014-03-24 12:11:30 +00:00
Calin Juravle
4d77c1151c
Fix LP64 libm for 128-bit long doubles
...
* reworked amd64/_fpmath.h and arm64/_fpmath.h to support 128-bit long
doubles.
* improved tests to cover long double cases
* made modfl an alias for LP32
Tests pass on x86, x86_64, arm, arm64 and mips.
Bug: 12921273
Change-Id: Ibe39acde57972447a8950fa45b1e702acc68ebeb
2014-03-24 11:48:42 +00:00
Nick Kralevich
aefe43b182
am 95c1abec: Merge "FORTIFY_SOURCE: don\'t define s?printf macros if already defined"
...
* commit '95c1abecc02b2a2f40b507e669b5bc17d4412bf9':
FORTIFY_SOURCE: don't define s?printf macros if already defined
2014-03-22 18:06:03 +00:00
Nick Kralevich
15a69298ef
am 95c1abec: Merge "FORTIFY_SOURCE: don\'t define s?printf macros if already defined"
...
* commit '95c1abecc02b2a2f40b507e669b5bc17d4412bf9':
FORTIFY_SOURCE: don't define s?printf macros if already defined
2014-03-22 18:05:43 +00:00
Nick Kralevich
95c1abecc0
Merge "FORTIFY_SOURCE: don't define s?printf macros if already defined"
2014-03-22 17:55:49 +00:00
Chad Brubaker
836b490c76
resolved conflicts for merge of 081db840 to klp-dev-plus-aosp
...
Change-Id: I3696d19a42bfafe5ce137f3333751b85fb434a2a
2014-03-21 15:46:39 -07:00
Chad Brubaker
b9e1688cd9
am 1d3d0360: am 081db840: Allow overlap in resolv uid => DNS iface mapping
...
* commit '1d3d0360eee442c7c73006e2069acdc051575edb':
Allow overlap in resolv uid => DNS iface mapping
2014-03-21 21:09:37 +00:00
Chad Brubaker
1d3d0360ee
am 081db840: Allow overlap in resolv uid => DNS iface mapping
...
* commit '081db840befec895fb86e709ae95832ade2d065c':
Allow overlap in resolv uid => DNS iface mapping
2014-03-21 21:02:40 +00:00
Mark Salyzyn
508e255eff
am cce6c380: Merge "libc: Thread IDs missing from logcat -v thread"
...
* commit 'cce6c380d7c9574f823f5e038c28c793fdb55c58':
libc: Thread IDs missing from logcat -v thread
2014-03-21 20:16:58 +00:00
Mark Salyzyn
5b3c6fde09
am cce6c380: Merge "libc: Thread IDs missing from logcat -v thread"
...
* commit 'cce6c380d7c9574f823f5e038c28c793fdb55c58':
libc: Thread IDs missing from logcat -v thread
2014-03-21 20:16:57 +00:00
Mark Salyzyn
cce6c380d7
Merge "libc: Thread IDs missing from logcat -v thread"
2014-03-21 20:09:32 +00:00
Christopher Ferris
e1b2537738
am 998d7b03: Merge "Fix deadlock in timer_delete."
...
* commit '998d7b030763e8da6ff04020eedab552857587d2':
Fix deadlock in timer_delete.
2014-03-21 17:39:10 +00:00
Christopher Ferris
fe0f7a7944
am 998d7b03: Merge "Fix deadlock in timer_delete."
...
* commit '998d7b030763e8da6ff04020eedab552857587d2':
Fix deadlock in timer_delete.
2014-03-21 17:39:10 +00:00
Christopher Ferris
998d7b0307
Merge "Fix deadlock in timer_delete."
2014-03-21 17:26:58 +00:00
Calin Juravle
c20de90287
Remove ALIGNBYTES and ALIGN from <sys/param.h>
...
There are only three users of bionic definition of ALIGN and keeping it
in sys/param.h polutes the namespace.
I inline the definition in the the three places that's used.
Bug: 13400663
Change-Id: I565008e8426c38ffb07422f42cd8e547d53044e9
2014-03-21 09:59:34 +00:00
Christopher Ferris
753ad778bc
Fix deadlock in timer_delete.
...
If the callback function for a timer did a timer_delete, the function
would never return. The problem was that the timer_delete function would try
to wait until the timer thread has finished. Waiting for yourself to finish
doesn't work very well.
Bug: 13397340
Change-Id: Ica123a5bafbc8660c8a4a909e5c2dead55ca429d
2014-03-20 20:47:45 -07:00
Mark Salyzyn
8664be583a
libc: Thread IDs missing from logcat -v thread
...
- stuff caller's thread id into the packet.
Bug: 13568206
Change-Id: If8b318ef75c7dcdddb05da8ac3038860f0fda5ec
2014-03-20 16:35:18 -07:00
The Android Automerger
3b93d85e6c
merge in master-release history after reset to master
2014-03-20 05:49:13 -07:00
Calin Juravle
e3fb244f7a
am 00fa0390: am 2cc58603: Merge "Added a test flag to bionic run-test targets."
...
* commit '00fa0390dfba0f66685133b51474a2614399b70e':
Added a test flag to bionic run-test targets.
2014-03-19 18:45:27 +00:00
Calin Juravle
1b3e9f45fa
am 2cc58603: Merge "Added a test flag to bionic run-test targets."
...
* commit '2cc58603d5fd68ec582984318fb3c5f8865a186f':
Added a test flag to bionic run-test targets.
2014-03-19 18:39:04 +00:00
Calin Juravle
00fa0390df
am 2cc58603: Merge "Added a test flag to bionic run-test targets."
...
* commit '2cc58603d5fd68ec582984318fb3c5f8865a186f':
Added a test flag to bionic run-test targets.
2014-03-19 18:39:01 +00:00
Calin Juravle
2cc58603d5
Merge "Added a test flag to bionic run-test targets."
2014-03-19 18:31:26 +00:00
Calin Juravle
7227066726
Added a test flag to bionic run-test targets.
...
It makes it much easier to pass arguments to the tests.
Change-Id: Ia91eba4868627a3cea3f8d2c26ba01af4e860b12
2014-03-19 18:23:36 +00:00
Nick Kralevich
7eb28b59c7
FORTIFY_SOURCE: don't define s?printf macros if already defined
...
Clang specific: Don't #define sprintf and snprintf macros if they
are already defined.
Change-Id: I30fc507d898377e1b8a57a65a147926229e0f9e2
2014-03-18 17:03:38 -07:00
The Android Automerger
82e02c3f77
merge in master-release history after reset to master
2014-03-18 05:49:17 -07:00
Christopher Ferris
46e998fe08
am 6bde44a6: am 849e162d: Merge "Use the float/double assert macros."
...
* commit '6bde44a6a2a2f37eb04d4e73b49ccb9d90ba5ecd':
Use the float/double assert macros.
2014-03-18 00:02:38 +00:00
Christopher Ferris
da6c5f7a71
am 849e162d: Merge "Use the float/double assert macros."
...
* commit '849e162d3bedc5ca61bdf15486268b253b9f4e93':
Use the float/double assert macros.
2014-03-17 23:57:41 +00:00
Christopher Ferris
6bde44a6a2
am 849e162d: Merge "Use the float/double assert macros."
...
* commit '849e162d3bedc5ca61bdf15486268b253b9f4e93':
Use the float/double assert macros.
2014-03-17 23:57:41 +00:00
Christopher Ferris
849e162d3b
Merge "Use the float/double assert macros."
2014-03-17 23:51:36 +00:00
Christopher Ferris
f171b34cf0
Use the float/double assert macros.
...
The normal ASSERT_EQ macros don't work quite right for float/double values,
and result in false failures. Use the correct macros instead.
Bug: 13511379
Change-Id: Ic2feee7f3d3569f57b6453b8fa95222846c625cd
2014-03-17 16:40:26 -07:00
Chad Brubaker
081db840be
Allow overlap in resolv uid => DNS iface mapping
...
When multiple rules exist covering a given uid the one added most
recently will be used.
This allows us to handle the simultaneous tuns case where a new tun is
coming online for an already running VPN.
_resolv_clear_iface_for_uid_range now also takes the iface and removes
only that matching (iface, uid range) entry.
Bug: 12134439
Change-Id: I9b9cfcfae2f38c409022a8c76ccadad7e2babd78
android-4.4.4_r2.0.1
android-4.4.4_r2
android-4.4.4_r1.0.1
android-4.4.4_r1
android-4.4.3_r1.1.0.1
android-4.4.3_r1.1
android-4.4.3_r1.0.1
android-4.4.3_r1
android-4.4w_r1
android-cts-4.4_r4
2014-03-15 15:29:01 -07:00
The Android Automerger
408bb44471
merge in master-release history after reset to master
2014-03-15 05:49:33 -07:00
Calin Juravle
458c27c2c1
am b10e18dd: am f212bbf6: Merge "Update libm to the upstream head (2014.03.13)"
...
* commit 'b10e18dda57d00480ccbb6cd9a12783fd72874df':
Update libm to the upstream head (2014.03.13)
2014-03-14 17:52:42 +00:00
Elliott Hughes
092774abfc
am b689105d: am 143df89f: Merge "Clean up reentrancy cruft."
...
* commit 'b689105d79449bc40ec2c0947f17e188c0da6eef':
Clean up reentrancy cruft.
2014-03-14 17:52:41 +00:00
Elliott Hughes
48a06ec3f7
am 16b8b0e1: am d16100c1: Merge "Clean up <stdio.h> macros."
...
* commit '16b8b0e12cfbe0baa242740b6ede2acdee1054f4':
Clean up <stdio.h> macros.
2014-03-14 13:13:30 +00:00
Calin Juravle
38d61afd5b
am f212bbf6: Merge "Update libm to the upstream head (2014.03.13)"
...
* commit 'f212bbf666b77777063a3a94a672bcae80b15253':
Update libm to the upstream head (2014.03.13)
2014-03-14 11:03:53 +00:00
Calin Juravle
b10e18dda5
am f212bbf6: Merge "Update libm to the upstream head (2014.03.13)"
...
* commit 'f212bbf666b77777063a3a94a672bcae80b15253':
Update libm to the upstream head (2014.03.13)
2014-03-14 11:03:42 +00:00
Calin Juravle
f212bbf666
Merge "Update libm to the upstream head (2014.03.13)"
2014-03-14 10:58:18 +00:00
Elliott Hughes
e130bc103e
am 5321a9e7: am 6ece7fc3: Merge "property: fix getting dirty serial value"
...
* commit '5321a9e7401bc4ca0839884c627376367aee34c8':
property: fix getting dirty serial value
2014-03-14 10:46:37 +00:00
Elliott Hughes
b689105d79
am 143df89f: Merge "Clean up reentrancy cruft."
...
* commit '143df89f729f39f4286f12daaf9cacf5c4501357':
Clean up reentrancy cruft.
2014-03-14 09:13:14 +00:00
Elliott Hughes
62188636e2
am 143df89f: Merge "Clean up reentrancy cruft."
...
* commit '143df89f729f39f4286f12daaf9cacf5c4501357':
Clean up reentrancy cruft.
2014-03-14 08:55:40 +00:00
Elliott Hughes
143df89f72
Merge "Clean up reentrancy cruft."
2014-03-14 04:58:20 +00:00