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
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
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
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
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
143df89f72
Merge "Clean up reentrancy cruft."
2014-03-14 04:58:20 +00:00
Elliott Hughes
16b8b0e12c
am d16100c1
: Merge "Clean up <stdio.h> macros."
...
* commit 'd16100c1fb8a39215497243ecb12176e9688ef77':
Clean up <stdio.h> macros.
2014-03-13 23:19:36 +00:00
Elliott Hughes
205c7887ad
Clean up reentrancy cruft.
...
The DNS copy of reentrant.h was unused, so remove it.
The strtod implementation can use the upstream-netbsd reentrant.h and
get a little closer to what was then upstream. (It's since been replaced
by gdtoa, and we'll have to follow at some point, but for now this doesn't
make anything any worse.)
ANDROID_CHANGES is (now) only used in the DNS code, so push the -D
down.
The <locale.h> change prevents an LP32 hack from leaking into LP64.
Change-Id: Idf30b98a59d7ca8f7c6cd6d07020b512057911ef
2014-03-13 16:17:43 -07:00
Elliott Hughes
d16100c1fb
Merge "Clean up <stdio.h> macros."
2014-03-13 23:13:58 +00:00
Elliott Hughes
f2cea021ab
Clean up <stdio.h> macros.
...
Also neuter __isthreaded.
We should come back to try to hide struct FILE's internals for LP64.
Bug: 3453512
Bug: 3453550
Change-Id: I7e115329fb4579246a72fea367b9fc8cb6055d18
2014-03-13 14:54:53 -07:00
Elliott Hughes
2fcf90f1da
am 8cd36386
: am 01cd7885
: Merge "Upgrade to current upstream scanf implementation."
...
* commit '8cd3638641cbd1540508e72b84189a4bd24d2b22':
Upgrade to current upstream scanf implementation.
2014-03-13 21:20:15 +00:00
Elliott Hughes
5321a9e740
am 6ece7fc3
: Merge "property: fix getting dirty serial value"
...
* commit '6ece7fc33a389ef9bcbe78a83a6633e4cb4e4743':
property: fix getting dirty serial value
2014-03-13 20:21:05 +00:00
Elliott Hughes
6ece7fc33a
Merge "property: fix getting dirty serial value"
2014-03-13 20:16:18 +00:00
jiaguo
879d330499
property: fix getting dirty serial value
...
__system_property_serial just returned serial value without
checking if it is dirty, so check and wait until serial
value is not dirty before return
Change-Id: If485b6251b5555b004912c66c7c2cb455a7fdbdc
Signed-off-by: jiaguo <jiaguo@marvell.com>
2014-03-13 12:42:52 -07:00
Calin Juravle
bd3155dc5d
Update libm to the upstream head (2014.03.13)
...
The most relevant changes are the ones in s_erff.c which should improve
the overall speed of exececution and the maximum error in ULP.
Change-Id: I7bd867f902db418db67f02cd58578624357b1ee8
2014-03-13 16:20:36 +00:00
The Android Automerger
52e0d9aa81
merge in master-release history after reset to master
2014-03-13 05:49:21 -07:00
Elliott Hughes
8cd3638641
am 01cd7885
: Merge "Upgrade to current upstream scanf implementation."
...
* commit '01cd78854afe5707f0d5b2b8418de07a55f8fde4':
Upgrade to current upstream scanf implementation.
2014-03-13 00:55:56 +00:00
Elliott Hughes
01cd78854a
Merge "Upgrade to current upstream scanf implementation."
2014-03-13 00:49:23 +00:00
Elliott Hughes
603332fc4c
Upgrade to current upstream scanf implementation.
...
Also add a basic test.
Change-Id: Icc0e68a5716b9579244f6eb8bac1ab5a24eda85a
2014-03-12 17:10:41 -07:00
Elliott Hughes
14efe23765
am f3d83fa9
: am 0e79338d
: Merge "Ensure we always have symbols for atof, strtof, strtold."
...
* commit 'f3d83fa955cf4848b48850431c6a094662f53a69':
Ensure we always have symbols for atof, strtof, strtold.
2014-03-12 23:44:29 +00:00
Elliott Hughes
f3d83fa955
am 0e79338d
: Merge "Ensure we always have symbols for atof, strtof, strtold."
...
* commit '0e79338d12d1ca780efcd0720af92b0a70e55da8':
Ensure we always have symbols for atof, strtof, strtold.
2014-03-12 23:36:54 +00:00
Elliott Hughes
0e79338d12
Merge "Ensure we always have symbols for atof, strtof, strtold."
2014-03-12 23:32:37 +00:00
Elliott Hughes
5a8173860d
Ensure we always have symbols for atof, strtof, strtold.
...
We'll need a better implementation of strtold for LP64, but all our
long double functions are currently broken for LP64 anyway so this
isn't a regression.
Change-Id: I2bdebac11245d31521d5fa09a16331c03dc4339c
2014-03-12 16:12:57 -07:00
Mark Salyzyn
ff52f9f054
am 5b675903
: am 56e1eebd
: Merge "logd: default user space logger"
...
* commit '5b6759035b2f99f37cbdbf9de5c2e098f6ba3f76':
logd: default user space logger
2014-03-12 23:04:41 +00:00
Elliott Hughes
ad9cb39296
am 6a250387
: am eef2928f
: Merge "Include what you use."
...
* commit '6a250387c7b13d19a29a0024f0f399862fc67d60':
Include what you use.
2014-03-12 22:58:06 +00:00
Elliott Hughes
801a7a60cc
am b51e4216
: am 2282e16d
: Merge "Use [u]int32_t instead of __[u]int32_t in sys/types.h"
...
* commit 'b51e4216e81c02b67218bbe417db8293836c6121':
Use [u]int32_t instead of __[u]int32_t in sys/types.h
2014-03-12 22:58:05 +00:00
Mark Salyzyn
5b6759035b
am 56e1eebd
: Merge "logd: default user space logger"
...
* commit '56e1eebd39be4830f309603b38e4b1118c544fb3':
logd: default user space logger
2014-03-12 21:07:06 +00:00
Mark Salyzyn
56e1eebd39
Merge "logd: default user space logger"
2014-03-12 21:02:46 +00:00
Elliott Hughes
6a250387c7
am eef2928f
: Merge "Include what you use."
...
* commit 'eef2928f94ac6ff5659c6177785b47e6fcdd03a2':
Include what you use.
2014-03-12 20:56:22 +00:00
Elliott Hughes
b51e4216e8
am 2282e16d
: Merge "Use [u]int32_t instead of __[u]int32_t in sys/types.h"
...
* commit '2282e16d76c6691968bd62a4c4bb3ecefabc98ca':
Use [u]int32_t instead of __[u]int32_t in sys/types.h
2014-03-12 20:52:56 +00:00
Elliott Hughes
eef2928f94
Merge "Include what you use."
2014-03-12 20:51:48 +00:00
Elliott Hughes
40488560c1
Include what you use.
...
Don't rely on transitive includes. (Even though that works fine in AOSP.)
Change-Id: Ifc06575e4aea383cfff24d6c5c14fc0a7aabdf2b
2014-03-12 13:50:38 -07:00
Elliott Hughes
2282e16d76
Merge "Use [u]int32_t instead of __[u]int32_t in sys/types.h"
2014-03-12 20:48:39 +00:00
Pavel Chupin
2725ca95b2
Use [u]int32_t instead of __[u]int32_t in sys/types.h
...
Avoid this error in -ffreestanding mode:
sys/types.h:45:1: error: unknown type name '__uint32_t'
Change-Id: I826b36873862d1d70b47401f31f4369a77666b8e
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2014-03-13 00:23:43 +04:00
Mark Salyzyn
c1005aaf8e
logd: default user space logger
...
Change-Id: Id205b01537940051c72d79def28a3c1a8b169a21
2014-03-12 13:17:38 -07:00