OSDN Git Service
Ben Schwartz [Tue, 23 May 2017 13:32:28 +0000 (13:32 +0000)]
Merge "Make use of the DNS query hook in the netcontext" am:
dc18a4be63 am:
ad9c1115c3
am:
dc3fe10073
Change-Id: I57b5cee903532db0a305d5c80734709b14240d60
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:58:58 +0000 (05:58 +0000)]
Merge "Move libdlext_... to NATIVE_TESTS instead of ETC" am:
c777139e02 am:
9eefe1b614
am:
8b14282691
Change-Id: I0b54c86cb394f4e469657d36e528a821a075703f
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:58:06 +0000 (00:58 +0000)]
Merge changes Iefdc1662,I8ee9ce62 am:
7bbe7cb619 am:
b6d5a3b15e
am:
0f12c9c072
Change-Id: Ife47e682918033e848e6046bd4030e7a6bb0388a
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 23:01:30 +0000 (23:01 +0000)]
Merge "Add a netcontext variant of gethostbyname" am:
6e7f14d9f7 am:
1c8d284b22
am:
d24f0f50dc
Change-Id: Ib19865ef531fff7d42b8af97139aa513227ada3c
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:24:42 +0000 (10:24 +0000)]
Merge "Add a netcontext variant of gethostbyaddr" am:
4767bc4a6c am:
6968edc290
am:
e6a3acecd8
Change-Id: Ifdee34b6d68cba16dad3133cb8fe5b40ba81d837
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:10:44 +0000 (03:10 +0000)]
Merge "Add the DNS query hook to net context" am:
761bb2be4d am:
8c298ad102
am:
8e23b44e57
Change-Id: Iea296c8343cfeeee26e482ff0c4fe9197b883f87
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:22:26 +0000 (22:22 +0000)]
Merge "Va_end should be used with va_start" am:
137a2cf967 am:
c29146f9d0
am:
4b0c81661b
Change-Id: Iff6b2d83e33badd2b7fa46e265b5399141120e98
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
Christopher Ferris [Sat, 20 May 2017 06:38:21 +0000 (06:38 +0000)]
Merge "Fix missing function export." am:
8433d40f56 am:
ef3c62dd72
am:
c57b5bcebe
Change-Id: Ie3e107eb23a4d664ab4717ff0983fe1a5ef63edd
Josh Gao [Sat, 20 May 2017 06:38:02 +0000 (06:38 +0000)]
Merge commit '
8fbd15a6d0818916a821bc2138208f0251c9754f' into manual_merge_8fbd15a6d am:
ecec45c681
am:
d61111ff8d
Change-Id: Ibb6a6126b7887bc566ed574ece7c38802065598e
Josh Gao [Sat, 20 May 2017 06:37:56 +0000 (06:37 +0000)]
The future is now. am:
cfb61712c4
am:
d2972dbffa
Change-Id: I852fb23b6fa111d93530e3ee370e23923a3be971
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
Christopher Ferris [Fri, 19 May 2017 19:37:27 +0000 (19:37 +0000)]
Merge "libc: ARM64: fix memset for non-standard ZVA sizes" into oc-dev
am:
a46ed8f52b
Change-Id: I50bbee3be16e622122c71a8b42a899ba15405019
Christopher Ferris [Fri, 19 May 2017 19:25:23 +0000 (19:25 +0000)]
Merge "libc: ARM64: fix memset for non-standard ZVA sizes" into oc-dev
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
Sandeep Patil [Thu, 18 May 2017 18:57:08 +0000 (18:57 +0000)]
Merge "properties: do not fail in the absence of vendor properties" into oc-dev
am:
f80c5595aa
Change-Id: I5207895e7c85e9179be16caffdbe894bf1f111df
TreeHugger Robot [Thu, 18 May 2017 18:50:28 +0000 (18:50 +0000)]
Merge "properties: do not fail in the absence of vendor properties" into oc-dev
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
Dimitry Ivanov [Thu, 18 May 2017 16:33:57 +0000 (16:33 +0000)]
Merge "Revert "linker: remove link from external library on unload"" into oc-dev
am:
f80b2bae2f
Change-Id: Id7e4908181fb869de30676fc5c5e6abe3d24d383
Dimitry Ivanov [Thu, 18 May 2017 16:22:20 +0000 (16:22 +0000)]
Merge "Revert "linker: remove link from external library on unload"" into oc-dev
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
Zhenhua WANG [Thu, 18 May 2017 15:22:52 +0000 (15:22 +0000)]
Compare Pss of tested library in VerifyMemorySaving
am:
f963bc3833
Change-Id: I09cfe1c3d7791e061036ca533a2e29c07ed85684
Elliott Hughes [Thu, 18 May 2017 02:39:13 +0000 (02:39 +0000)]
Merge "Fix Mac build." am:
f06535035e am:
ee4f8a1da3
am:
475e0d4cf5
Change-Id: I29b33798d338bf0517986004b09fc7d55f5a84c9
Christopher Ferris [Thu, 18 May 2017 02:38:59 +0000 (02:38 +0000)]
Merge "Make mallopt available in the future." am:
61073263d4 am:
3806a1376d
am:
531499ecb8
Change-Id: Idc10fe3050934ff547558219f8d6eecac7c9911b
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 02:03:26 +0000 (02:03 +0000)]
Merge "Remove reference to obj/lib" am:
f599b7285b am:
71b60e73c7
am:
b0b2982991
Change-Id: I584d859cadf6f09ded21d0bfab31b00d1f54594c
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"
Dimitry Ivanov [Wed, 17 May 2017 18:46:54 +0000 (11:46 -0700)]
Revert "linker: remove link from external library on unload"
This reverts commit
b37d10cc8017c102530c096537890b7c6215ad2b.
Was merged from nyc-dev to master and oc-dev by mistake.
Bug: http://b/
38384727
Test: bionic-unit-tests
Change-Id: I7cd352baceb3180342abb6ffec1dfa96a217961f
Elliott Hughes [Thu, 18 May 2017 00:36:08 +0000 (17:36 -0700)]
Fix Mac build.
Bug: N/A
Test: builds
Change-Id: Ia3dae9f86a0aaa5431929e790f5c36f8beaf3bed
Dan Willemsen [Wed, 17 May 2017 23:47:23 +0000 (16:47 -0700)]
Remove reference to obj/lib
It's going away, since we don't have a single library on device anymore,
and it's simpler to keep the host looking like the device. This doesn't
seem to need it anymore either -- the libraries are found relative to
the test binary.
Test: bionic/tests/run-on-host.sh glibc
Change-Id: Ie9bf6388ecd773623181ec9eadb35d6e0ba0a441
Sandeep Patil [Wed, 17 May 2017 18:33:37 +0000 (11:33 -0700)]
properties: do not fail in the absence of vendor properties
/vendor is not mounted in recovery and so the property initialization
must not fail if the vendor property context is not found.
Bug:
38212419
Test: boot into recovery, mount system and run adb shell getprop
Change-Id: I9f7c2fe2b20da86194eff8e7bf94b2352e50bf27
Signed-off-by: Sandeep Patil <sspatil@google.com>
Elliott Hughes [Wed, 17 May 2017 23:07:14 +0000 (23:07 +0000)]
Merge "tests/utils.h should #include <sys/sysmacros.h>" am:
7ff7ed1c7d am:
0cb7460a9a
am:
c6371b09a4
Change-Id: I1931a8ec57e70317d96d3833538d13a792fe637f
Elliott Hughes [Wed, 17 May 2017 23:03:20 +0000 (23:03 +0000)]
Merge "tests/utils.h should #include <sys/sysmacros.h>" am:
7ff7ed1c7d
am:
0cb7460a9a
Change-Id: Ic7d7d685d0767cbf9ebd6a7004b79b5b4818fffd
Elliott Hughes [Wed, 17 May 2017 22:59:43 +0000 (22:59 +0000)]
Merge "tests/utils.h should #include <sys/sysmacros.h>"
am:
7ff7ed1c7d
Change-Id: Idf28abe3dfcc9cb1d20b1e4d92c1453a90ec1206
Treehugger Robot [Wed, 17 May 2017 22:48:53 +0000 (22:48 +0000)]
Merge "tests/utils.h should #include <sys/sysmacros.h>"
Christopher Ferris [Wed, 17 May 2017 21:48:59 +0000 (14:48 -0700)]
Make mallopt available in the future.
I made this in 26 but it's really only available in the future.
Test: Built angler image.
Change-Id: I9e1179b350103bf1b8774459a9e210b377300d40
Zhenhua WANG [Tue, 25 Apr 2017 03:07:19 +0000 (11:07 +0800)]
Compare Pss of tested library in VerifyMemorySaving
DlExtRelroSharingTest.VerifyMemorySaving verifies whether
android_dlopen_ext(ANDROID_DLEXT_USE_RELRO) really saves memory.
This patch compares Pss of the tested library rather than total
Pss of the process, in case different behavior of dlopen() and
android_dlopen_ext() introduces random Pss usage.
Test: DlExtRelroSharingTest.VerifyMemorySaving
(cherry picked from commit
81aad0058cd0961dfd9f3006dd979c1fdd6ca659)
Bug: https://issuetracker.google.com/
38226388
Change-Id: I4248628fa951b38818fe2af363fdf78abf09a112
Dan Willemsen [Wed, 17 May 2017 20:07:00 +0000 (20:07 +0000)]
Merge "Stop using $(TARGET_OUT_INTERMEDIATE_LIBRARIES)" am:
afd629582b am:
c338bb924c
am:
e0d8313024
Change-Id: I8c62771349c8d439d94cae809ba0c920c61f1a16
Dan Willemsen [Wed, 17 May 2017 20:05:01 +0000 (20:05 +0000)]
Merge "Stop using $(TARGET_OUT_INTERMEDIATE_LIBRARIES)" am:
afd629582b
am:
c338bb924c
Change-Id: I6a99f1662f692bd8723fd509ef246a5332629357
Dan Willemsen [Wed, 17 May 2017 20:01:30 +0000 (20:01 +0000)]
Merge "Stop using $(TARGET_OUT_INTERMEDIATE_LIBRARIES)"
am:
afd629582b
Change-Id: Ia943a9439c80f4fa3ae81e0a192e4e82aeec63b4
Dan Willemsen [Wed, 17 May 2017 19:50:53 +0000 (19:50 +0000)]
Merge "Stop using $(TARGET_OUT_INTERMEDIATE_LIBRARIES)"
Elliott Hughes [Wed, 17 May 2017 18:43:39 +0000 (11:43 -0700)]
tests/utils.h should #include <sys/sysmacros.h>
Bug: https://github.com/android-ndk/ndk/issues/398
Test: builds
Change-Id: Ie81b49787d468e409db4024763f29946d3e4250f
Dimitry Ivanov [Tue, 16 May 2017 23:22:24 +0000 (23:22 +0000)]
Merge "linker: remove link from external library on unload" into mnc-dev am:
8dee813dfa am:
15db978797 am:
91779f4867 am:
5f7fb9c5c3 -s ours am:
8ac6cf6206 -s ours am:
7c7e2e9289 -s ours am:
35c675c622 -s ours am:
c469356635 -s ours am:
c5a7a52110 -s ours
am:
5dae762622 -s ours
Change-Id: I2cce49faa42402ab0cecb4ad6fc6ec1f5a922b28
Dimitry Ivanov [Tue, 16 May 2017 23:21:23 +0000 (23:21 +0000)]
Merge "linker: remove link from external library on unload" into mnc-dev am:
8dee813dfa am:
15db978797 am:
91779f4867 am:
5f7fb9c5c3 -s ours am:
8ac6cf6206 -s ours am:
7c7e2e9289 -s ours am:
35c675c622 -s ours am:
c469356635 -s ours am:
c5a7a52110 -s ours
am:
bb67386c85 -s ours
Change-Id: I130e11716e512cbc13e90b2f771136ecc3a69f73
Dimitry Ivanov [Tue, 16 May 2017 23:19:52 +0000 (23:19 +0000)]
Merge "linker: remove link from external library on unload" into mnc-dev am:
8dee813dfa am:
15db978797 am:
91779f4867 am:
5f7fb9c5c3 -s ours am:
8ac6cf6206 -s ours am:
7c7e2e9289 -s ours am:
35c675c622 -s ours am:
c469356635 -s ours
am:
c5a7a52110 -s ours
Change-Id: Idbf0bb590a4d77c0102bf90a9f24b158483f0e38
Dimitry Ivanov [Tue, 16 May 2017 23:19:52 +0000 (23:19 +0000)]
Merge "linker: remove link from external library on unload" into mnc-dev am:
8dee813dfa am:
15db978797 am:
91779f4867 am:
5f7fb9c5c3 -s ours am:
8ac6cf6206 -s ours am:
7c7e2e9289 -s ours am:
35c675c622 -s ours am:
c469356635 -s ours
am:
c5a7a52110 -s ours
Change-Id: I8994648dd0d80640b9d0934e7147a58767c39b4b
Dimitry Ivanov [Tue, 16 May 2017 23:17:53 +0000 (23:17 +0000)]
Merge "linker: remove link from external library on unload" into mnc-dev am:
8dee813dfa am:
15db978797 am:
91779f4867 am:
5f7fb9c5c3 -s ours am:
8ac6cf6206 -s ours am:
7c7e2e9289 -s ours am:
35c675c622 -s ours
am:
c469356635 -s ours
Change-Id: I14cbcf1e8fed51b19e95be5935263f911a8dc67a
Dimitry Ivanov [Tue, 16 May 2017 23:16:22 +0000 (23:16 +0000)]
Merge "linker: remove link from external library on unload" into mnc-dev am:
8dee813dfa am:
15db978797 am:
91779f4867 am:
5f7fb9c5c3 -s ours am:
8ac6cf6206 -s ours am:
7c7e2e9289 -s ours
am:
35c675c622 -s ours
Change-Id: Ia43552011fb6d84bf0925f424d6537451a7fa8fe
Dimitry Ivanov [Tue, 16 May 2017 23:14:51 +0000 (23:14 +0000)]
Merge "linker: remove link from external library on unload" into mnc-dev am:
8dee813dfa am:
15db978797 am:
91779f4867 am:
5f7fb9c5c3 -s ours am:
8ac6cf6206 -s ours
am:
7c7e2e9289 -s ours
Change-Id: Ibba224f7f39097b813b2103eec989763feb2a39a
Dimitry Ivanov [Tue, 16 May 2017 23:12:51 +0000 (23:12 +0000)]
Merge "linker: remove link from external library on unload" into mnc-dev am:
8dee813dfa am:
15db978797 am:
91779f4867 am:
5f7fb9c5c3 -s ours
am:
8ac6cf6206 -s ours
Change-Id: If6f918223a4470142673bbd76ab0c541af5e12ed
Dimitry Ivanov [Tue, 16 May 2017 23:11:20 +0000 (23:11 +0000)]
Merge "linker: remove link from external library on unload" into mnc-dev am:
8dee813dfa am:
15db978797 am:
91779f4867
am:
5f7fb9c5c3 -s ours
Change-Id: I227e5d3ce904f8f1f15fe33366bf5736a6dbc8e2
Dimitry Ivanov [Tue, 16 May 2017 23:09:50 +0000 (23:09 +0000)]
Merge "linker: remove link from external library on unload" into mnc-dev am:
8dee813dfa am:
15db978797
am:
91779f4867
Change-Id: Ifef3f85a01f7deaf7a17c2c562304d3af1361705
Dimitry Ivanov [Tue, 16 May 2017 23:08:20 +0000 (23:08 +0000)]
Merge "linker: remove link from external library on unload" into mnc-dev am:
8dee813dfa
am:
15db978797
Change-Id: I7998e10917cad017c6a8684c6439c19c149c5928
Dimitry Ivanov [Tue, 16 May 2017 23:06:24 +0000 (23:06 +0000)]
Merge "linker: remove link from external library on unload" into mnc-dev
am:
8dee813dfa
Change-Id: Idb826e7c818f12c21bd50a082c8252a996b2bdde
Dimitry Ivanov [Tue, 16 May 2017 23:00:14 +0000 (23:00 +0000)]
Merge "linker: remove link from external library on unload" into mnc-dev
Dan Willemsen [Tue, 16 May 2017 19:51:21 +0000 (12:51 -0700)]
Stop using $(TARGET_OUT_INTERMEDIATE_LIBRARIES)
It's going away, so use the built versions in the per-library
intermediate directories instead.
Test: `m -j bionic-unit-tests` produces the same output before/after
Change-Id: Ia5cd874d13129b2be89cdc26e4ec598be4003c87
Android Build Merger (Role) [Tue, 16 May 2017 22:24:08 +0000 (22:24 +0000)]
Merge "linker: remove link from external library on unload am:
b37d10cc80 am:
3a644889b2 am:
cb40eec87c am:
0399816edb am:
85efd3b591 am:
5ef13ba0ca" into oc-dev-plus-aosp
Dimitry Ivanov [Tue, 16 May 2017 22:24:02 +0000 (22:24 +0000)]
linker: remove link from external library on unload am:
b37d10cc80 am:
3a644889b2 am:
cb40eec87c am:
0399816edb am:
85efd3b591
am:
5ef13ba0ca
Change-Id: I89d260cffe33449759ebf225f9c67ec404125c0c
Dimitry Ivanov [Tue, 16 May 2017 22:23:53 +0000 (22:23 +0000)]
linker: remove link from external library on unload am:
b37d10cc80 am:
3a644889b2 am:
cb40eec87c am:
0399816edb am:
85efd3b591
am:
efbc04475e
Change-Id: I8ce3dde72d55a7c13b620157c100a63f26c3791f
OSDN Git Service
