OSDN Git Service
Christopher Ferris [Wed, 31 May 2017 18:32:26 +0000 (18:32 +0000)]
Merge "Revert "Make mallopt available in the future."" am:
8f7a987cd0
am:
bf52fee214
Change-Id: I318f22e95f2ef59b240bf5b8bfc87eb0babb2d98
Christopher Ferris [Wed, 31 May 2017 18:28:21 +0000 (18:28 +0000)]
Merge "Revert "Make mallopt available in the future.""
am:
8f7a987cd0
Change-Id: I0db255e6778cd2cfb64206c3a2ec635e62a18e9a
Christopher Ferris [Wed, 31 May 2017 18:15:09 +0000 (18:15 +0000)]
Merge "Revert "Make mallopt available in the future.""
Christopher Ferris [Wed, 31 May 2017 17:54:06 +0000 (17:54 +0000)]
Merge "Add mallopt to canonical list of exports." am:
8f6f70db45
am:
21d0a8c15b
Change-Id: Iad3d739123a5e8132d8c201a1032fbf95f1167ea
Christopher Ferris [Wed, 31 May 2017 17:49:04 +0000 (17:49 +0000)]
Merge "Add mallopt to canonical list of exports."
am:
8f6f70db45
Change-Id: I3bd9320bf7c53c4f2f6586d55d5a3c0f3e8307e9
Christopher Ferris [Wed, 31 May 2017 17:40:31 +0000 (17:40 +0000)]
Merge "Add mallopt to canonical list of exports."
Christopher Ferris [Wed, 31 May 2017 00:35:28 +0000 (17:35 -0700)]
Add mallopt to canonical list of exports.
Bug:
62202823
Test: Ran script and verified that none of the other map files are modified.
Change-Id: Ib890ce77c60b877434fbb65a5add8f6c4603d3d0
Christopher Ferris [Wed, 31 May 2017 00:14:15 +0000 (00:14 +0000)]
Revert "Make mallopt available in the future."
This reverts commit
083923d96acb7cfe4e1a1c22100047fa87feb347.
Reason for revert: No longer correct, this will be in API 26.
Change-Id: Iaf82d797405135fcd30455fd750b23fc57e9623a
Elliott Hughes [Fri, 26 May 2017 18:10:47 +0000 (18:10 +0000)]
Merge "Enable exporting the non-uapi scsi headers." am:
6be65c135b
am:
d0b030eb9c
Change-Id: I90f87bfd05e8be59ad507f3466b8f78c0e885656
Elliott Hughes [Fri, 26 May 2017 18:08:21 +0000 (18:08 +0000)]
Merge "Enable exporting the non-uapi scsi headers."
am:
6be65c135b
Change-Id: Id8c535cf060b6cb9f38efc70dcda43031f2375fb
Elliott Hughes [Fri, 26 May 2017 18:04:26 +0000 (18:04 +0000)]
Merge "Enable exporting the non-uapi scsi headers."
Christopher Ferris [Fri, 26 May 2017 17:05:11 +0000 (17:05 +0000)]
Merge "Add offset to backtrace_string printing." am:
f6a5afcb62
am:
c4d31c981a
Change-Id: Iab1201771f12ce3e59954a88d2a897ba68f74984
Christopher Ferris [Fri, 26 May 2017 17:03:11 +0000 (17:03 +0000)]
Merge "Add offset to backtrace_string printing."
am:
f6a5afcb62
Change-Id: I06647308b9cf01405007b136dc5978c436cbcbb6
Christopher Ferris [Fri, 26 May 2017 16:57:58 +0000 (16:57 +0000)]
Merge "Add offset to backtrace_string printing."
Elliott Hughes [Fri, 26 May 2017 00:13:32 +0000 (17:13 -0700)]
Enable exporting the non-uapi scsi headers.
Callers are supposed to #include <scsi/sg.h> but if we tell soong to add
bionic/libc/kernel/android/ to the include path, the uapi headers in there
would be (unintentionally) accessible as either <linux/name.h> or
<uapi/linux/name.h>.
Bug: N/A (hit while upgrading strace to 4.17)
Test: builds
Change-Id: I8d47dd51da688c38f747a255d401dfb2c209c805
Dimitry Ivanov [Fri, 26 May 2017 01:41:41 +0000 (01:41 +0000)]
Merge "Relax flaky _SC_AVPHYS_PAGES check in sys_sysinfo_test" am:
232681160a
am:
82f4098497
Change-Id: I02cf9d73a15e93f109639edb13a4048bd91101d2
Dimitry Ivanov [Fri, 26 May 2017 01:39:41 +0000 (01:39 +0000)]
Merge "Relax flaky _SC_AVPHYS_PAGES check in sys_sysinfo_test"
am:
232681160a
Change-Id: Ie2d150492163e59814a0557baed86a5bed9fa125
Christopher Ferris [Fri, 26 May 2017 01:26:37 +0000 (18:26 -0700)]
Add offset to backtrace_string printing.
The libmemunreachable code uses backtrace_string to print out the backtrace
information. However, when the offset of the map that a frame is in is
non-zero, no information is printed. This means that when a frame comes from
a shared library loaded from an apk, it's impossible to tell which
shared library the frame is really coming from.
Add the offset display when it's non-zero. This means this can now be fed
to development/scripts/stack to decode the frame.
Bug:
37276041
Test: Ran dumpsys meminfo --unreachable on an app that leaks from a
Test: shared library and verified the offset output is present.
Change-Id: I61d34ae3f617622d354cc099eff520a64782b6e2
Treehugger Robot [Fri, 26 May 2017 01:30:01 +0000 (01:30 +0000)]
Merge "Relax flaky _SC_AVPHYS_PAGES check in sys_sysinfo_test"
Paul Lawrence [Fri, 26 May 2017 01:10:39 +0000 (01:10 +0000)]
Merge "Expand whitelist" am:
eca29cb508
am:
27752635e9
Change-Id: I6669f8bb0820f7ba51157ac32a0eb4326b1c963e
Paul Lawrence [Fri, 26 May 2017 01:08:39 +0000 (01:08 +0000)]
Merge "Expand whitelist"
am:
eca29cb508
Change-Id: Ic673b3fcaca1bb311da4aa23b8c8f2e24598d4f6
Treehugger Robot [Fri, 26 May 2017 01:01:54 +0000 (01:01 +0000)]
Merge "Expand whitelist"
Christopher Ferris [Fri, 26 May 2017 00:43:07 +0000 (00:43 +0000)]
Merge "Update malloc debug documentation." am:
a559cff654
am:
b597371036
Change-Id: I3867e2b66f2062d061f9e34e6ca1b75f17823319
Christopher Ferris [Fri, 26 May 2017 00:41:07 +0000 (00:41 +0000)]
Merge "Update malloc debug documentation."
am:
a559cff654
Change-Id: I9efbff08ce65d3c973a588065841b99f1faac17a
Christopher Ferris [Fri, 26 May 2017 00:29:59 +0000 (00:29 +0000)]
Merge "Update malloc debug documentation."
Christopher Ferris [Thu, 25 May 2017 02:04:33 +0000 (19:04 -0700)]
Update malloc debug documentation.
Test: NA
Change-Id: I8ab73bfc28c7a673efb5b0cec6067989153f092a
Paul Lawrence [Thu, 25 May 2017 21:15:23 +0000 (14:15 -0700)]
Expand whitelist
Bug:
37769298
Test: Boots. Cannot test app behavior without account
Change-Id: Iebb7616f100368bf2e702ec51f637df1f3727885
Elliott Hughes [Thu, 25 May 2017 23:08:00 +0000 (23:08 +0000)]
Merge "Remove the repetitive warnings from the uapi headers." am:
025fb33c9d
am:
fd387e7d0a
Change-Id: Idcf8c0db2ca3c1fe0cd5cd9ea5148fe6598b2c4b
Elliott Hughes [Thu, 25 May 2017 23:03:00 +0000 (23:03 +0000)]
Merge "Remove the repetitive warnings from the uapi headers."
am:
025fb33c9d
Change-Id: I98bb1dd996bd331948d0e2ec3b2acf17c2d3f4c3
Treehugger Robot [Thu, 25 May 2017 22:50:05 +0000 (22:50 +0000)]
Merge "Remove the repetitive warnings from the uapi headers."
Dimitry Ivanov [Thu, 25 May 2017 21:02:03 +0000 (14:02 -0700)]
Relax flaky _SC_AVPHYS_PAGES check in sys_sysinfo_test
The number of available physical pages is not constant and can
potentially change between calls to get_avphys_pages and
sysconf(_SC_AVPHYS_PAGES) calls.
Relax the assert to check that sconf(_SC_AVPHYS_PAGES) <= phys_pages.
Bug: http://b/
31502852
Test: build and run bionic-unit-tests
Change-Id: Ibf8873d2151d93239391d2638dfbf055b70cde3a
Elliott Hughes [Thu, 25 May 2017 20:48:01 +0000 (13:48 -0700)]
Remove the repetitive warnings from the uapi headers.
Having
WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS
every four lines made the headers harder to read, made the diffs much worse
each time we upgraded, and wasn't really providing any benefit. Before the
next uapi update, let's just stop doing this.
Bug: N/A
Test: builds, manually inspected files look right
Change-Id: Id7088cf750894c9d24950f3d53587fe3156c4f7d
Elliott Hughes [Thu, 25 May 2017 01:50:05 +0000 (01:50 +0000)]
Merge "Stop including <sys/sysmacros.h> from <sys/types.h>." am:
f58179cda5
am:
b9bf674cc8
Change-Id: I5e24c7d7ce1f136353c64608f6b665be2f96c38d
Elliott Hughes [Thu, 25 May 2017 01:47:05 +0000 (01:47 +0000)]
Merge "Stop including <sys/sysmacros.h> from <sys/types.h>."
am:
f58179cda5
Change-Id: If03478f3cd2f6c0a8ac51a7ed0bc4b07d497430d
Treehugger Robot [Thu, 25 May 2017 01:43:05 +0000 (01:43 +0000)]
Merge "Stop including <sys/sysmacros.h> from <sys/types.h>."
Christopher Ferris [Thu, 25 May 2017 01:35:03 +0000 (01:35 +0000)]
Merge "Fix assembler warnings." am:
1143a62977
am:
119ffa4e29
Change-Id: I84a0c8f42d0d7ce71f00cb034347553789c19f9a
Christopher Ferris [Thu, 25 May 2017 01:32:03 +0000 (01:32 +0000)]
Merge "Fix assembler warnings."
am:
1143a62977
Change-Id: Iea37406fe631e0754499d6448773f1e7a010af86
Christopher Ferris [Thu, 25 May 2017 01:26:17 +0000 (01:26 +0000)]
Merge "Fix assembler warnings."
Christopher Ferris [Wed, 24 May 2017 23:00:37 +0000 (16:00 -0700)]
Fix assembler warnings.
There are a few instructions deprecated on armv8 that result in lots
of warnings. Add an arch directive so that these warnings go away.
This doesn't cause any problems because the instructions still
execute properly.
Bug:
38319728
Test: Built all of these assembler files and verified the warning are gone.
Change-Id: If063defdd16f290c01975233c8d257d1b2005e76
Elliott Hughes [Wed, 24 May 2017 15:13:19 +0000 (15:13 +0000)]
Merge "Remove obsolete __stack_chk_fail_local." am:
6c01208e90
am:
c80d8405da
Change-Id: I7f98e7bf679fab61e7d48893a059c2ce75691f13
Elliott Hughes [Wed, 24 May 2017 15:10:32 +0000 (15:10 +0000)]
Merge "Remove obsolete __stack_chk_fail_local."
am:
6c01208e90
Change-Id: I553466e7908b3e1fa4718d08a376b4ac472704ab
Elliott Hughes [Wed, 24 May 2017 15:05:59 +0000 (15:05 +0000)]
Merge "Remove obsolete __stack_chk_fail_local."
Elliott Hughes [Wed, 24 May 2017 07:30:18 +0000 (07:30 +0000)]
Merge "Fix _POSIX_THREAD_PROCESS_SHARED." am:
1f66c6d078
am:
540f5de440
Change-Id: Ifcf3941a32106642c675dba7bcf1387150a48934
Elliott Hughes [Wed, 24 May 2017 07:19:17 +0000 (07:19 +0000)]
Merge "Fix _POSIX_THREAD_PROCESS_SHARED."
am:
1f66c6d078
Change-Id: I6776058ce3338eaf83adf47ed0b0998970b1bc46
Treehugger Robot [Wed, 24 May 2017 07:13:34 +0000 (07:13 +0000)]
Merge "Fix _POSIX_THREAD_PROCESS_SHARED."
Elliott Hughes [Tue, 23 May 2017 23:47:16 +0000 (23:47 +0000)]
Merge "Switch to inline assembler in crtbegin." am:
81a5b6f558
am:
cbdf8923b3
Change-Id: I828f31bb3572b44b043c27fc25e885c7de37236e
Elliott Hughes [Tue, 23 May 2017 23:45:15 +0000 (23:45 +0000)]
Merge "Switch to inline assembler in crtbegin."
am:
81a5b6f558
Change-Id: I8f4f1976179e5cb2ea0172319a8a26b31da59ad0
Elliott Hughes [Tue, 23 May 2017 23:43:30 +0000 (16:43 -0700)]
Remove obsolete __stack_chk_fail_local.
Clang doesn't use this.
Bug: N/A
Test: x86 emulator builds and boots
Change-Id: I2865c0d568a644f61f34bdea539daff5224896bc
Elliott Hughes [Tue, 23 May 2017 23:39:59 +0000 (23:39 +0000)]
Merge "Switch to inline assembler in crtbegin."
Elliott Hughes [Tue, 23 May 2017 22:53:36 +0000 (15:53 -0700)]
Stop including <sys/sysmacros.h> from <sys/types.h>.
<sys/types.h> unconditionally includes <sys/sysmacros.h>.
<sys/sysmacros.h> defines major, minor, and makedev. In the deprecated NDK
headers, these were inline functions. In the unified headers, they are
function-like macros.
The inline functions would only collide with another function called major,
minor, or makedev but the macros will replace anything with a function-like
form such as definitions of class methods called major, minor, or makedev.
This causes code which has such definitions to fail to compile when moving
from the deprecated headers to the unified headers.
Resolve this by removing the transitive dependency. Folks who want
<sys/sysmacros.h> can ask for it explicitly (it's been in both bionic and
glibc for years, though I don't think macOS has it [as usual]).
Bug: https://github.com/android-ndk/ndk/issues/398
Test: builds
Change-Id: If2921c7b5d979c3066f199f22c64d4d2f7bf6632
Elliott Hughes [Tue, 23 May 2017 18:03:58 +0000 (11:03 -0700)]
Switch to inline assembler in crtbegin.
Using __builtin_frame_address was clever, but didn't work for arm64 (for
reasons which were never investigated) and the ChromeOS folks claim it
causes trouble for x86 with ARC++ (though without a reproduceable test case).
Naked functions turn out to be quite unevenly supported: some architectures
do the right thing, others don't; some architectures warn, others don't (and
the warnings don't always match the platforms that _actually_ have problems).
Inline assembler also removes the guessing games: everyone knows what the
couple of instructions _ought_ to be, and now we don't have to reason about
what the compiler will actually do (yet still keep the majority of the code
in C).
Bug: N/A
Test: builds, boots
Change-Id: I14207ef50ca46b6eca273c3cb7509c311146a3ca
Ben Schwartz [Tue, 23 May 2017 13:27:28 +0000 (13:27 +0000)]
Merge "Make use of the DNS query hook in the netcontext" am:
dc18a4be63
am:
ad9c1115c3
Change-Id: I421aa5b4e4dc7fd743b80221313921ae4c36f25c
Ben Schwartz [Tue, 23 May 2017 13:24:57 +0000 (13:24 +0000)]
Merge "Make use of the DNS query hook in the netcontext"
am:
dc18a4be63
Change-Id: I9a0779ef72669ff1b95a962bb8c7f8baa0a5a60e
Treehugger Robot [Tue, 23 May 2017 13:17:41 +0000 (13:17 +0000)]
Merge "Make use of the DNS query hook in the netcontext"
Dan Willemsen [Tue, 23 May 2017 05:57:28 +0000 (05:57 +0000)]
Merge "Move libdlext_... to NATIVE_TESTS instead of ETC" am:
c777139e02
am:
9eefe1b614
Change-Id: I53b3a9a19b57961d92c4f7c1101d56c5e8bf0749
Dan Willemsen [Tue, 23 May 2017 05:55:27 +0000 (05:55 +0000)]
Merge "Move libdlext_... to NATIVE_TESTS instead of ETC"
am:
c777139e02
Change-Id: I1406bf31a247a7d8f7c0844a7619b76b08b60f59
Dan Willemsen [Tue, 23 May 2017 05:50:37 +0000 (05:50 +0000)]
Merge "Move libdlext_... to NATIVE_TESTS instead of ETC"
Dan Albert [Tue, 23 May 2017 00:55:36 +0000 (00:55 +0000)]
Merge changes Iefdc1662,I8ee9ce62 am:
7bbe7cb619
am:
b6d5a3b15e
Change-Id: I4b7aa46e387bf85af60eeb77a3e086e4ac31f1c6
Dan Albert [Tue, 23 May 2017 00:53:37 +0000 (00:53 +0000)]
Merge changes Iefdc1662,I8ee9ce62
am:
7bbe7cb619
Change-Id: Idbf3b079085e13ce59592ae435e9cf72aefc0f90
Treehugger Robot [Tue, 23 May 2017 00:48:00 +0000 (00:48 +0000)]
Merge changes Iefdc1662,I8ee9ce62
* changes:
Don't define IN_CLOEXEC/IN_NONBLOCK for pre-L.
Undef EPOLL_CLOEXEC for pre-L.
Dan Willemsen [Tue, 23 May 2017 00:36:16 +0000 (17:36 -0700)]
Move libdlext_... to NATIVE_TESTS instead of ETC
ETC did end up causing problems, since it's not per-arch. But
SHARED_LIBRARIES isn't correct either, since the build system tries to
read shared libraries as ELF files (to create the toc files).
NATIVE_TESTS is slightly better -- they are not libraries, so we don't
attempt to generate toc files, but they are considered per-arch.
Bug:
38463793
Test: Run CtsBionicTestCases
Change-Id: I01b4b093359e0c39eb2f8639d5c5dde9e304ed20
Ben Schwartz [Mon, 22 May 2017 22:52:29 +0000 (22:52 +0000)]
Merge "Add a netcontext variant of gethostbyname" am:
6e7f14d9f7
am:
1c8d284b22
Change-Id: If6220e5fb32df3a0a3b2d355e07acb891dce3ed1
Ben Schwartz [Mon, 22 May 2017 22:44:29 +0000 (22:44 +0000)]
Merge "Add a netcontext variant of gethostbyname"
am:
6e7f14d9f7
Change-Id: Id4a34056525f1e9b91767f348fce8fa76ed3d379
Ben Schwartz [Mon, 24 Apr 2017 21:57:11 +0000 (17:57 -0400)]
Make use of the DNS query hook in the netcontext
This will allow netd to run queries over TLS:
https://android-review.googlesource.com/#/c/391513/
https://android-review.googlesource.com/#/c/380593/
Bug:
34953048
Test: Device tests pass. No issues during manual testing.
Change-Id: I8d613322307fc40cdba59b82599eda753697278f
Treehugger Robot [Mon, 22 May 2017 22:29:08 +0000 (22:29 +0000)]
Merge "Add a netcontext variant of gethostbyname"
Dan Albert [Mon, 22 May 2017 19:58:18 +0000 (12:58 -0700)]
Don't define IN_CLOEXEC/IN_NONBLOCK for pre-L.
Some third-party code uses the existence of IN_CLOEXEC/IN_NONBLOCK to
detect the availability of inotify_init1. This is not correct, since
`syscall(__NR_inotify_init1, IN_CLOEXEC)` is still valid even if the C
library doesn't have that function, but for the time being we don't
want to harm adoption to the unified headers. We'll avoid defining
IN_CLOEXEC and IN_NONBLOCK if we don't have inotify_init1 for the time
being, and maybe revisit this later.
Test: make checkbuild
Bug: https://github.com/android-ndk/ndk/issues/394
Change-Id: Iefdc1662b21045de886c7ad1cbeba6241163d943
Dan Albert [Mon, 22 May 2017 19:52:00 +0000 (12:52 -0700)]
Undef EPOLL_CLOEXEC for pre-L.
Some third-party code uses the existence of EPOLL_CLOEXEC to detect
the availability of epoll_create1. This is not correct, since having
up-to-date UAPI headers says nothing about the C library, but for the
time being we don't want to harm adoption to the unified headers.
We'll undef EPOLL_CLOEXEC if we don't have epoll_create1 for the time
being, and maybe revisit this later.
Test: make checkbuild
Bug: https://github.com/android-ndk/ndk/issues/302
Bug: https://github.com/android-ndk/ndk/issues/394
Change-Id: I8ee9ce62768fb174070ec51d114f477389befc4a
Ben Schwartz [Mon, 22 May 2017 14:19:25 +0000 (10:19 -0400)]
Add a netcontext variant of gethostbyname
Bug:
34953048
Test: Integration tests pass
Change-Id: I670427d67fde09d8e76ea6a920c90a1969230c4f
Ben Schwartz [Mon, 22 May 2017 10:19:41 +0000 (10:19 +0000)]
Merge "Add a netcontext variant of gethostbyaddr" am:
4767bc4a6c
am:
6968edc290
Change-Id: I52b0f0f965c3f2243f73556271205a20c3062d34
Ben Schwartz [Mon, 22 May 2017 10:14:12 +0000 (10:14 +0000)]
Merge "Add a netcontext variant of gethostbyaddr"
am:
4767bc4a6c
Change-Id: I546698a95e394b8bb9b6ac82c849bd00bd71e470
Treehugger Robot [Mon, 22 May 2017 10:06:29 +0000 (10:06 +0000)]
Merge "Add a netcontext variant of gethostbyaddr"
Ben Schwartz [Mon, 22 May 2017 03:05:44 +0000 (03:05 +0000)]
Merge "Add the DNS query hook to net context" am:
761bb2be4d
am:
8c298ad102
Change-Id: Ib83a84a620887a1e572a4cd06f25c3966dfff45a
Ben Schwartz [Mon, 22 May 2017 03:00:43 +0000 (03:00 +0000)]
Merge "Add the DNS query hook to net context"
am:
761bb2be4d
Change-Id: I00da8f2a38502a5b9abe421672dfd861d76f3a65
Treehugger Robot [Mon, 22 May 2017 02:51:33 +0000 (02:51 +0000)]
Merge "Add the DNS query hook to net context"
Mikhail Lappo [Sat, 20 May 2017 22:18:56 +0000 (22:18 +0000)]
Merge "Va_end should be used with va_start" am:
137a2cf967
am:
c29146f9d0
Change-Id: Ie6d5a075d7cddce22ef6ed92b91e3c2319a56236
Mikhail Lappo [Sat, 20 May 2017 22:14:57 +0000 (22:14 +0000)]
Merge "Va_end should be used with va_start"
am:
137a2cf967
Change-Id: I388f8bba1a728d8c8cec13cc976de32d7ff3d422
Treehugger Robot [Sat, 20 May 2017 22:08:10 +0000 (22:08 +0000)]
Merge "Va_end should be used with va_start"
Mikhail Lappo [Sat, 25 Mar 2017 18:02:55 +0000 (19:02 +0100)]
Va_end should be used with va_start
va_start is used and va_end should
be invoked accordingly
Change-Id: I2b0a2af762e22082a351a4d8139aaa48bc791e88
Elliott Hughes [Sat, 20 May 2017 19:47:14 +0000 (12:47 -0700)]
Fix _POSIX_THREAD_PROCESS_SHARED.
We've had pthread_*_setpshared for long enough that there are no
__INTRODUCED_IN guards.
Found because fio's configure script was confused by this.
Bug: N/A
Test: ran tests
Change-Id: I07b4d937741e4dcd7e615f2371b17c827341917a
Christopher Ferris [Sat, 20 May 2017 06:35:52 +0000 (06:35 +0000)]
Merge "Fix missing function export." am:
8433d40f56
am:
ef3c62dd72
Change-Id: I7256cad109c80ca48408ca5a92ab32adde332413
Josh Gao [Sat, 20 May 2017 06:35:34 +0000 (06:35 +0000)]
Merge commit '
8fbd15a6d0818916a821bc2138208f0251c9754f' into manual_merge_8fbd15a6d
am:
ecec45c681
Change-Id: I30f169a1bb30a11c64b404a2ca33defe01fcf6db
Josh Gao [Sat, 20 May 2017 06:35:26 +0000 (06:35 +0000)]
The future is now.
am:
cfb61712c4
Change-Id: Ia8f81932e8cea901e387b10ba2ecd912d24ee96a
Christopher Ferris [Sat, 20 May 2017 06:32:58 +0000 (06:32 +0000)]
Merge "Fix missing function export."
am:
8433d40f56
Change-Id: Idc07f1228cfb100ee93fe8fedde2290c273d4e79
Josh Gao [Sat, 20 May 2017 05:43:28 +0000 (22:43 -0700)]
Merge commit '
8fbd15a6d0818916a821bc2138208f0251c9754f' into manual_merge_8fbd15a6d
Josh Gao [Thu, 20 Apr 2017 19:58:31 +0000 (12:58 -0700)]
The future is now.
__INTRODUCED_IN_FUTURE -> __INTRODUCED_IN(26)
Bug: http://b/
37437368
Test: treehugger
Change-Id: I601a23da83b65a0cd582cc840ed3856a9031b673
(cherry picked from commit
cb302f932a3532f1484e1e70894e9b1199384283)
(Cherry picked a DO N*T MERGE commit that should have been merged)
(cherry picked from commit
2e8e5e60b6ecbcfe2110242e41b9ec5340b11cf5)
Christopher Ferris [Fri, 19 May 2017 23:20:25 +0000 (23:20 +0000)]
Merge "Fix missing function export."
Christopher Ferris [Fri, 19 May 2017 20:47:16 +0000 (13:47 -0700)]
Fix missing function export.
Bug:
36401135
Test: Actually enable debug malloc and verify it loads properly.
Test: Ran unit tests.
Change-Id: I9df1699b06bb14c5df2c3cab35dc2eb0819033f1
Elliott Hughes [Fri, 19 May 2017 18:24:08 +0000 (18:24 +0000)]
Merge "Make `union semun` usable."
Elliott Hughes [Thu, 18 May 2017 22:05:26 +0000 (15:05 -0700)]
Make `union semun` usable.
This is a bit bogus because it's been removed from glibc (though not
thoroughly) and is never useful on Android (because the system calls
in question are compiled out of Android kernels, and SELinux would
disallow them even if you weren't running an Android kernel). This
also means that on glibc you need to include <linux/sem.h> for this
and on bionic you need <sys/sem.h> (and for either if you #include
the other file, you won't get this union).
Bug: https://github.com/android-ndk/ndk/issues/400
Test: added new test
Change-Id: I47f721da77515531f616d6ad8479bfbc9b60ee47
Ben Schwartz [Mon, 24 Apr 2017 21:57:11 +0000 (17:57 -0400)]
Add a netcontext variant of gethostbyaddr
Bug:
34953048
Test: Integration tests pass
Change-Id: Id04830345be56cd7a077981c6e2acfb5568e7a88
Ben Schwartz [Mon, 24 Apr 2017 21:57:11 +0000 (17:57 -0400)]
Add the DNS query hook to net context
This change
- adds a query hook to android_net_context
- exposes relevant definitions to netd
- corrects a bug in query hooks' interaction with the cache
This change does not introduce any code to read the query hook
from the net context or make use of it.
Bug:
34953048
Test: Netd test suite passes
Change-Id: Ie091980e22ce9da07a3c4d387b371e544379d762
Elliott Hughes [Thu, 18 May 2017 02:35:45 +0000 (02:35 +0000)]
Merge "Fix Mac build." am:
f06535035e
am:
ee4f8a1da3
Change-Id: I09b2f6c514e1c2f29024b513e95f1ab7c2376a1e
Christopher Ferris [Thu, 18 May 2017 02:35:30 +0000 (02:35 +0000)]
Merge "Make mallopt available in the future." am:
61073263d4
am:
3806a1376d
Change-Id: Ia80fa309ccb153b21bc04d0be8351fdd73569455
Elliott Hughes [Thu, 18 May 2017 02:32:46 +0000 (02:32 +0000)]
Merge "Fix Mac build."
am:
f06535035e
Change-Id: Iea05b71a1a5d5a434be37505f103f57a7d62c608
Christopher Ferris [Thu, 18 May 2017 02:32:28 +0000 (02:32 +0000)]
Merge "Make mallopt available in the future."
am:
61073263d4
Change-Id: I80103d02919ceb0cd2cbf26598513b611b530466
Treehugger Robot [Thu, 18 May 2017 02:23:36 +0000 (02:23 +0000)]
Merge "Fix Mac build."
Christopher Ferris [Thu, 18 May 2017 02:23:05 +0000 (02:23 +0000)]
Merge "Make mallopt available in the future."
Dan Willemsen [Thu, 18 May 2017 01:59:26 +0000 (01:59 +0000)]
Merge "Remove reference to obj/lib" am:
f599b7285b
am:
71b60e73c7
Change-Id: Ic4b0b37dc393002f187a25031561594a1999dea4
Dan Willemsen [Thu, 18 May 2017 01:55:55 +0000 (01:55 +0000)]
Merge "Remove reference to obj/lib"
am:
f599b7285b
Change-Id: Iddc87e00f61f1d0a367945dc12427c71c61bd944
Treehugger Robot [Thu, 18 May 2017 01:49:36 +0000 (01:49 +0000)]
Merge "Remove reference to obj/lib"