OSDN Git Service
Elliott Hughes [Tue, 17 May 2016 00:34:14 +0000 (00:34 +0000)]
Merge "Fix the <netinet/ether.h> tests." am:
c9a21334c5 am:
e40e8dae2b am:
b20c295522
am:
572f4b311b
* commit '
572f4b311bbc708089372290d321fba0c45f183a':
Fix the <netinet/ether.h> tests.
Change-Id: I01022110966bd0e2612f0063de112a8f7731090f
Elliott Hughes [Tue, 17 May 2016 00:31:39 +0000 (00:31 +0000)]
Merge "Fix the <netinet/ether.h> tests." am:
c9a21334c5 am:
e40e8dae2b
am:
b20c295522
* commit '
b20c2955222041ca6e71c4c0b6868440f4aba721':
Fix the <netinet/ether.h> tests.
Change-Id: I15ddf64ee8c238bfa86a9aa7aa8f273a084e16a9
Elliott Hughes [Tue, 17 May 2016 00:29:16 +0000 (00:29 +0000)]
Merge "Fix the <netinet/ether.h> tests." am:
c9a21334c5
am:
e40e8dae2b
* commit '
e40e8dae2bf22a260362140f02a00a0e84995bfa':
Fix the <netinet/ether.h> tests.
Change-Id: Iba669f517be179ea1574c4a97918e1f7d47ffde7
Elliott Hughes [Tue, 17 May 2016 00:26:49 +0000 (00:26 +0000)]
Merge "Fix the <netinet/ether.h> tests."
am:
c9a21334c5
* commit '
c9a21334c5d375240f8cb04750dde284e3151785':
Fix the <netinet/ether.h> tests.
Change-Id: I77fa79bd6edeafcf60c5aaafab2e9f88af085d6b
Elliott Hughes [Tue, 17 May 2016 00:21:06 +0000 (00:21 +0000)]
Merge "Fix the <netinet/ether.h> tests."
Elliott Hughes [Mon, 16 May 2016 23:21:37 +0000 (16:21 -0700)]
Fix the <netinet/ether.h> tests.
Looks like I never ran these even once :-(
Change-Id: Ie488dec229cddf59a4f526b3c4e674ad4334c088
Elliott Hughes [Mon, 16 May 2016 22:24:30 +0000 (22:24 +0000)]
Merge "Fix <resolv.h> and <netinet/tcp.h> so dnscap builds." am:
cb8ef17b07 am:
74a4bfb38c am:
1a45fd0315
am:
e2aa1b6db6
* commit '
e2aa1b6db6db49839d176c7643e5fe2a14c2f5c5':
Fix <resolv.h> and <netinet/tcp.h> so dnscap builds.
Change-Id: I8a0737401f8c1b53ec41e3343c854fb25c12a4c1
Elliott Hughes [Mon, 16 May 2016 22:19:24 +0000 (22:19 +0000)]
Merge "Fix <resolv.h> and <netinet/tcp.h> so dnscap builds." am:
cb8ef17b07 am:
74a4bfb38c
am:
1a45fd0315
* commit '
1a45fd0315b21192c40a547c5a6c472f8abee4e0':
Fix <resolv.h> and <netinet/tcp.h> so dnscap builds.
Change-Id: I5771bf25ceda4a7848eb6fe28e83354ec18c2e50
Elliott Hughes [Mon, 16 May 2016 22:11:38 +0000 (22:11 +0000)]
Merge "Fix <resolv.h> and <netinet/tcp.h> so dnscap builds." am:
cb8ef17b07
am:
74a4bfb38c
* commit '
74a4bfb38c94fed77ecdfa0e42a6bd9f75d1feb7':
Fix <resolv.h> and <netinet/tcp.h> so dnscap builds.
Change-Id: Idc4481e0c5a86df8e843dda0854bedd2fe4f93c6
Elliott Hughes [Mon, 16 May 2016 22:08:03 +0000 (22:08 +0000)]
Merge "Fix <resolv.h> and <netinet/tcp.h> so dnscap builds."
am:
cb8ef17b07
* commit '
cb8ef17b07db1048777eebd92782edf1ecea1b36':
Fix <resolv.h> and <netinet/tcp.h> so dnscap builds.
Change-Id: Iefd54322ab3333f57111d58506d1035d1dfc6ded
Elliott Hughes [Mon, 16 May 2016 21:59:50 +0000 (21:59 +0000)]
Merge "Fix <resolv.h> and <netinet/tcp.h> so dnscap builds."
Elliott Hughes [Mon, 16 May 2016 21:31:01 +0000 (21:31 +0000)]
Merge "We have the _r ether_ntoa/ether_aton functions too." am:
20fc6ecf90 am:
abaf7f0bb7 am:
00bf97308c
am:
1d8496c584
* commit '
1d8496c584a3f0108474b4c58843e90750bc5f1f':
We have the _r ether_ntoa/ether_aton functions too.
Change-Id: I09bc8546ad8257215bbf5c767bc309c41f12a19e
Elliott Hughes [Mon, 16 May 2016 21:28:09 +0000 (21:28 +0000)]
Merge "We have the _r ether_ntoa/ether_aton functions too." am:
20fc6ecf90 am:
abaf7f0bb7
am:
00bf97308c
* commit '
00bf97308c2e31358c165f1259120ee2945fc152':
We have the _r ether_ntoa/ether_aton functions too.
Change-Id: I7b1bdbd83f855791bb834c31556fd1e99002d45d
Elliott Hughes [Mon, 16 May 2016 21:25:08 +0000 (21:25 +0000)]
Merge "We have the _r ether_ntoa/ether_aton functions too." am:
20fc6ecf90
am:
abaf7f0bb7
* commit '
abaf7f0bb7fabddbb86dbc21960f20e232e4f18f':
We have the _r ether_ntoa/ether_aton functions too.
Change-Id: Iae7a307b3014fbc21a8942e220ead62728e31d46
Elliott Hughes [Mon, 16 May 2016 21:22:10 +0000 (21:22 +0000)]
Merge "We have the _r ether_ntoa/ether_aton functions too."
am:
20fc6ecf90
* commit '
20fc6ecf90ea76b5a668a6007a33fb30a837d2fd':
We have the _r ether_ntoa/ether_aton functions too.
Change-Id: I3fe86744a88bf25517c29c4cb43201317fb92473
Elliott Hughes [Mon, 16 May 2016 21:12:38 +0000 (21:12 +0000)]
Merge "We have the _r ether_ntoa/ether_aton functions too."
Elliott Hughes [Mon, 16 May 2016 20:26:25 +0000 (13:26 -0700)]
Fix <resolv.h> and <netinet/tcp.h> so dnscap builds.
Some guy on the internet complained that dnscap doesn't build out of the box.
Now it does.
Bug: http://b/
27839637
Change-Id: I8c4f22d3c3f8885a6fe06029d89ef68a15931027
Elliott Hughes [Mon, 16 May 2016 20:24:31 +0000 (13:24 -0700)]
We have the _r ether_ntoa/ether_aton functions too.
We've also had them since H, not L.
Change-Id: Iee7633ea97a0ee9a00bf7b62ead315acf02a3c8e
Elliott Hughes [Mon, 16 May 2016 20:12:44 +0000 (20:12 +0000)]
Merge "Fix our *ether* headers mess." am:
e79b630daa am:
4d9f4086bd am:
bf95aaf65a
am:
b82ca2c2e1
* commit '
b82ca2c2e1c74fa5c862fa86a2d4d34ef6b39904':
Fix our *ether* headers mess.
Change-Id: Ied06aba5a41cbfa39d9dce31e52bc70921a60ce6
Elliott Hughes [Mon, 16 May 2016 20:10:08 +0000 (20:10 +0000)]
Merge "Fix our *ether* headers mess." am:
e79b630daa am:
4d9f4086bd
am:
bf95aaf65a
* commit '
bf95aaf65a22a55899faf60254462992159bf24d':
Fix our *ether* headers mess.
Change-Id: Iaab3974d78f3f708b1b5d3a8736045de5e7f2602
Elliott Hughes [Mon, 16 May 2016 20:07:52 +0000 (20:07 +0000)]
Merge "Fix our *ether* headers mess." am:
e79b630daa
am:
4d9f4086bd
* commit '
4d9f4086bdb9f216e3d1093ac7fd6dcdbbd76a65':
Fix our *ether* headers mess.
Change-Id: I706905b70d3fa5db77f32c13a25848615002af53
Elliott Hughes [Mon, 16 May 2016 20:05:33 +0000 (20:05 +0000)]
Merge "Fix our *ether* headers mess."
am:
e79b630daa
* commit '
e79b630daa1c1be9f83b19df824f2b5a0de966a4':
Fix our *ether* headers mess.
Change-Id: I0c94f4c94b6101b09ba68d542b8310dfb14e68ff
Elliott Hughes [Mon, 16 May 2016 20:00:09 +0000 (20:00 +0000)]
Merge "Fix our *ether* headers mess."
Elliott Hughes [Thu, 12 May 2016 20:11:28 +0000 (13:11 -0700)]
Fix our *ether* headers mess.
Move everything to where it should be.
Along the way, we lose <net/ethertypes.h>. glibc only has a handful of these
types, and they're all in <net/ethernet.h>, not <net/ethertypes.h>. I've taken
the liberty of not including the AppleTalk ones, since it is 2016.
Also, <net/if_ether.h> should be <netinet/if_ether.h> (though with different
contents).
Bug: http://b/
28519060
Change-Id: Ia41c3fc136fd3e6b008c8d08018e0629134ea6fc
Dan Willemsen [Thu, 12 May 2016 22:29:11 +0000 (22:29 +0000)]
Merge "Update Android.bp to match Android.mk" am:
56469e8de2 am:
d39c529186 am:
644e6a5eb7
am:
637294da30
* commit '
637294da30a544e41d6d19a164986e86d866bb7a':
Update Android.bp to match Android.mk
Change-Id: If905fb56d30a0b83250943a80db9e7f56f3b35d4
Dan Willemsen [Thu, 12 May 2016 22:26:49 +0000 (22:26 +0000)]
Merge "Update Android.bp to match Android.mk" am:
56469e8de2 am:
d39c529186
am:
644e6a5eb7
* commit '
644e6a5eb71f20844393d6c5fa2319dff1f41c48':
Update Android.bp to match Android.mk
Change-Id: Id00d5250e76c21988ba43cf015c9f43a962313db
Dan Willemsen [Thu, 12 May 2016 22:24:29 +0000 (22:24 +0000)]
Merge "Update Android.bp to match Android.mk" am:
56469e8de2
am:
d39c529186
* commit '
d39c5291861916e348ef0be26a549b849d283d89':
Update Android.bp to match Android.mk
Change-Id: I004591ffca57b7510a7a9d56631e49788dec8cf5
Dan Willemsen [Thu, 12 May 2016 22:21:46 +0000 (22:21 +0000)]
Merge "Update Android.bp to match Android.mk"
am:
56469e8de2
* commit '
56469e8de225bdd16e6f0fa887ce65294bfb9ed1':
Update Android.bp to match Android.mk
Change-Id: Icfd7da8a33254b209feaf5ba2f81aad5c59592a0
Treehugger Robot [Thu, 12 May 2016 22:15:00 +0000 (22:15 +0000)]
Merge "Update Android.bp to match Android.mk"
Dan Willemsen [Thu, 12 May 2016 08:43:07 +0000 (01:43 -0700)]
Update Android.bp to match Android.mk
* Remove --exclude-libs ldflags (
e29e99c51)
* Mips strlen check was inverted
* ARM specific libc changes only apply to the shared library
* Reorder libjemalloc and malloc_common to match Make's ordering (for
better binary diffing)
Change-Id: Ib41bd47565b1e8fadd285daa7b337cff1edd0808
Pierre Imai [Thu, 12 May 2016 07:59:21 +0000 (07:59 +0000)]
Merge "Always update search domain paths. am:
b0cfefac91 am:
6e1729f7aa" into nyc-mr1-dev-plus-aosp
am:
f8c5a65d82
* commit '
f8c5a65d825c780d2efb5e4f05c480d9e1f665bc':
Change-Id: I7c9baabc55fc92920b1e599cd5860a3a060ba1a7
Pierre Imai [Thu, 12 May 2016 07:59:21 +0000 (07:59 +0000)]
Always update search domain paths. am:
b0cfefac91 am:
8e2fbfc65d
am:
c4c5bccabb
* commit '
c4c5bccabb98622074fd3e729ec88dfbf60425d5':
Always update search domain paths.
Change-Id: If91a1f91c8eb28318830545d66c2e675de154617
Android Build Merger (Role) [Thu, 12 May 2016 07:57:06 +0000 (07:57 +0000)]
Merge "Always update search domain paths. am:
b0cfefac91 am:
6e1729f7aa" into nyc-mr1-dev-plus-aosp
Pierre Imai [Thu, 12 May 2016 07:56:53 +0000 (07:56 +0000)]
Always update search domain paths. am:
b0cfefac91
am:
8e2fbfc65d
* commit '
8e2fbfc65d6a22d5df5f8d1574e7e7802232c410':
Always update search domain paths.
Change-Id: I7ae26318275215c0166634bef1601d14427395dc
Pierre Imai [Thu, 12 May 2016 07:56:53 +0000 (07:56 +0000)]
Always update search domain paths. am:
b0cfefac91
am:
6e1729f7aa
* commit '
6e1729f7aa56f543637ed7a5a527be351b71db90':
Always update search domain paths.
Change-Id: If378c6741500162cb00430399ba5e63bcc74965e
Pierre Imai [Thu, 12 May 2016 07:54:27 +0000 (07:54 +0000)]
Always update search domain paths.
am:
b0cfefac91
* commit '
b0cfefac916a2e136afaeecb141d1804e19d6e6e':
Always update search domain paths.
Change-Id: I03f018565881e0d680af3415ac6635d165147f24
Pierre Imai [Thu, 12 May 2016 07:54:27 +0000 (07:54 +0000)]
Always update search domain paths.
am:
b0cfefac91
* commit '
b0cfefac916a2e136afaeecb141d1804e19d6e6e':
Always update search domain paths.
Change-Id: I6fb15094ee7776a1e92fb59915a664b3a93ad140
Pierre Imai [Thu, 12 May 2016 03:05:53 +0000 (03:05 +0000)]
Merge "Always update search domain paths." am:
6db7e5a10d am:
f0d6097189 am:
fb3363f678
am:
ce5c248ed0
* commit '
ce5c248ed0f3b6c4124f603f6355a3babc54de27':
Always update search domain paths.
Change-Id: I21266c8a68bd28ded9d1949bc58b5711cacb9ee4
Pierre Imai [Thu, 12 May 2016 03:03:29 +0000 (03:03 +0000)]
Merge "Always update search domain paths." am:
6db7e5a10d am:
f0d6097189
am:
fb3363f678
* commit '
fb3363f67800e956ad9a5e87297b86933b0867e0':
Always update search domain paths.
Change-Id: Ica3cf56af0dec77f5f34a23bf5f4f4e5dcd06092
Pierre Imai [Thu, 12 May 2016 03:01:01 +0000 (03:01 +0000)]
Merge "Always update search domain paths." am:
6db7e5a10d
am:
f0d6097189
* commit '
f0d60971897f1cf7d79c59285de1c2a67092f96c':
Always update search domain paths.
Change-Id: I63b0b458c220e42e036a387f44858b76541a2c63
Pierre Imai [Thu, 12 May 2016 02:58:30 +0000 (02:58 +0000)]
Merge "Always update search domain paths."
am:
6db7e5a10d
* commit '
6db7e5a10db01bfa36bde4bb2066159ab2f41fa3':
Always update search domain paths.
Change-Id: I3eaf70ec46e027854a571300a55e4deeceafcdce
Pierre Imai [Fri, 6 May 2016 08:56:57 +0000 (17:56 +0900)]
Always update search domain paths.
_resolv_set_nameservers_for_net() so far did not update the search
paths, unless the servers changed as well.
BUG:
28437641
Change-Id: Id31f2d97c173e00357fb2ba95908afb4572c0fc1
(cherry picked from commit
06e2202a4cc6d9a0f382a0bbdcdbd2d527734d5f)
Elliott Hughes [Thu, 12 May 2016 02:53:17 +0000 (02:53 +0000)]
Merge "Remove <net/if_types.h>." am:
b277bb755a am:
a3c6190bad am:
2638d1b774
am:
7ea0afa258
* commit '
7ea0afa2580dab7d1d6d6b944a1b98b2ea8cbc06':
Remove <net/if_types.h>.
Change-Id: I073706f26b49a4c276fefefd12b82d786c6f17b0
Pierre Imai [Thu, 12 May 2016 02:51:23 +0000 (02:51 +0000)]
Merge "Always update search domain paths."
Elliott Hughes [Thu, 12 May 2016 02:41:39 +0000 (02:41 +0000)]
Merge "Remove <net/if_types.h>." am:
b277bb755a am:
a3c6190bad
am:
2638d1b774
* commit '
2638d1b774b901b1003d3230872506527a464297':
Remove <net/if_types.h>.
Change-Id: Id4f9c016ef39341818f3685135ac4bd99ca2d844
Elliott Hughes [Thu, 12 May 2016 02:36:45 +0000 (02:36 +0000)]
Merge "Remove <net/if_types.h>." am:
b277bb755a
am:
a3c6190bad
* commit '
a3c6190bad3583be5e1cfc3c174227f872cc7c62':
Remove <net/if_types.h>.
Change-Id: I783e76a0103c19e838e42a5786f2aa46642131da
Elliott Hughes [Thu, 12 May 2016 02:31:48 +0000 (02:31 +0000)]
Merge "Remove <net/if_types.h>."
am:
b277bb755a
* commit '
b277bb755a3cafb96e1203228017e5fcbd885889':
Remove <net/if_types.h>.
Change-Id: I768e74cad42d762e3a70cf6616f67a248c87c486
Elliott Hughes [Thu, 12 May 2016 02:23:42 +0000 (02:23 +0000)]
Merge "Remove <net/if_types.h>."
Dimitry Ivanov [Thu, 12 May 2016 00:12:57 +0000 (00:12 +0000)]
resolve merge conflicts of
19b669b to nyc-dev-plus-aosp am:
e2c5e36396
am:
d11679c31e
* commit '
d11679c31ee8bfea5bbcd244e5c7ce4910e72814':
Change-Id: I3d7f91fbf16db3b21a8a058272913a44565cacaa
Dimitry Ivanov [Thu, 12 May 2016 00:12:46 +0000 (00:12 +0000)]
resolve merge conflicts of
55d9927 to nyc-mr1-dev-plus-aosp
am:
19a446715b
* commit '
19a446715b3d1e44f9c8870f8e2bf686023516c8':
Remove linker-namespace functions from the header
Change-Id: I29c7fe00feafb795d4e95943d156dc43e23f876e
Dimitry Ivanov [Wed, 11 May 2016 23:30:35 +0000 (23:30 +0000)]
resolve merge conflicts of
19b669b to nyc-dev-plus-aosp
am:
e2c5e36396
* commit '
e2c5e36396c5f7f8f58694a177615ce6b69ccfee':
Change-Id: Ieb8778c11977e187dad42bb1d7e75f90e53779f6
Dimitry Ivanov [Wed, 11 May 2016 23:23:56 +0000 (16:23 -0700)]
resolve merge conflicts of
55d9927 to nyc-mr1-dev-plus-aosp
Change-Id: Ic40f4a55fcfe641e78bed73230d1202c3ff307e1
Dimitry Ivanov [Wed, 11 May 2016 23:22:03 +0000 (16:22 -0700)]
resolve merge conflicts of
19b669b to nyc-dev-plus-aosp
Change-Id: If66754e3a9992ceb5f51173c794c7658ec5ee775
Elliott Hughes [Wed, 11 May 2016 23:19:43 +0000 (23:19 +0000)]
Merge "Remove various bits of header cruft." am:
d0b173316a am:
cff5daca20 am:
6d3daa7242
am:
e7fe9b3913
* commit '
e7fe9b39135b2589bdb3d680f1f95d6d4859d37d':
Remove various bits of header cruft.
Change-Id: Ic5bdaf9b7708156d00b504abeb6b8159c5c63459
Dimitry Ivanov [Wed, 11 May 2016 23:14:41 +0000 (23:14 +0000)]
Remove linker-namespace functions from the header
am:
19b669b003
* commit '
19b669b00325bcbab4679c4e57c5d8d95f54decb':
Remove linker-namespace functions from the header
Change-Id: I9ab57bbcb819ffd4bdcca6a304c841b2e2c840e8
Elliott Hughes [Wed, 11 May 2016 22:07:52 +0000 (22:07 +0000)]
Merge "Remove various bits of header cruft." am:
d0b173316a am:
cff5daca20
am:
6d3daa7242
* commit '
6d3daa7242365eea29e24d89e3e559b2ac359fd3':
Remove various bits of header cruft.
Change-Id: I6add669b9c8caefe91e0eeaae478d5b47b7b9498
Elliott Hughes [Wed, 11 May 2016 22:00:19 +0000 (15:00 -0700)]
Remove <net/if_types.h>.
Bug: http://b/
28519060
Change-Id: I7481df528b281344879b4aac32551d8c40824195
Dimitry Ivanov [Wed, 11 May 2016 22:00:04 +0000 (22:00 +0000)]
Merge "Remove linker-namespace functions from the header" am:
35c115c196 am:
d118a32058 am:
e2663ee164
am:
982ca7236f
* commit '
982ca7236f384ee57ba09b14921f1600fe44e89e':
Remove linker-namespace functions from the header
Change-Id: Iaace8cbf6e8e5362fab6f7bc7edb10c274d5720f
Elliott Hughes [Wed, 11 May 2016 21:56:53 +0000 (21:56 +0000)]
Merge "Remove various bits of header cruft." am:
d0b173316a
am:
cff5daca20
* commit '
cff5daca202bd1e350692bc10f6c32ade06f9787':
Remove various bits of header cruft.
Change-Id: I8e6dc1763ceb330dd95c3ee5d2dee676db4bb41d
Elliott Hughes [Wed, 11 May 2016 21:50:03 +0000 (21:50 +0000)]
Merge "Remove various bits of header cruft."
am:
d0b173316a
* commit '
d0b173316a92399ae3c2348bcbd9e32cd5b21536':
Remove various bits of header cruft.
Change-Id: I144a4d95dc447504116aec66340754304a4c4ca4
Dimitry Ivanov [Wed, 11 May 2016 21:32:45 +0000 (21:32 +0000)]
Merge "Remove linker-namespace functions from the header" am:
35c115c196 am:
d118a32058
am:
e2663ee164
* commit '
e2663ee164df6f72f0ba0258aec2e3bd611fa66a':
Remove linker-namespace functions from the header
Change-Id: Ia6226cf0c74e5828ca9b75e6b77f9935c0974645
Dimitry Ivanov [Wed, 11 May 2016 21:28:06 +0000 (21:28 +0000)]
Merge "Remove linker-namespace functions from the header" am:
35c115c196
am:
d118a32058
* commit '
d118a320584d14063d29aa96dc31d190d0dd61c6':
Remove linker-namespace functions from the header
Change-Id: I69ee16509ed01da55c145534869b4f8392cc91c6
Elliott Hughes [Wed, 11 May 2016 21:25:01 +0000 (21:25 +0000)]
Merge "Remove various bits of header cruft."
Dimitry Ivanov [Wed, 11 May 2016 21:21:29 +0000 (21:21 +0000)]
Merge "Remove linker-namespace functions from the header"
am:
35c115c196
* commit '
35c115c196c13dea255489a005dce0a38c33a7ab':
Remove linker-namespace functions from the header
Change-Id: Id8245e9a36a3b35678cb2d82cff9d46257b329ce
Dimitry Ivanov [Tue, 10 May 2016 00:37:39 +0000 (17:37 -0700)]
Remove linker-namespace functions from the header
They are intended for platform use only and we shouldn't have them
in the public header file.
Bug: http://b/
28174921
Change-Id: Ib9b3d0fa9442cfa2e784a693ad567d1444d774e5
(cherry picked from commit
41fd29532b52bb66e3e1f4620053713fd0299f6e)
Dimitry Ivanov [Wed, 11 May 2016 21:14:41 +0000 (21:14 +0000)]
Merge "Remove linker-namespace functions from the header"
Pierre Imai [Fri, 6 May 2016 08:56:57 +0000 (17:56 +0900)]
Always update search domain paths.
_resolv_set_nameservers_for_net() so far did not update the search
paths, unless the servers changed as well.
BUG:
28437641
Change-Id: Id31f2d97c173e00357fb2ba95908afb4572c0fc1
Elliott Hughes [Wed, 11 May 2016 00:32:48 +0000 (17:32 -0700)]
Remove various bits of header cruft.
Mostly BSD _KERNEL stuff.
Change-Id: Ic0a6914437d0c831a83588a435079d0c719fcbdf
Elliott Hughes [Tue, 10 May 2016 20:10:34 +0000 (20:10 +0000)]
Merge "Remove declaration of pthread_cond_timedwait_relative_np." am:
366164da10 am:
a7e53c57e6 am:
5da438bc3b
am:
36ba202c1a
* commit '
36ba202c1a100c7c590564cb1dd3b318840498d8':
Remove declaration of pthread_cond_timedwait_relative_np.
Change-Id: I2adfc483e801d1e7c438d7676f5d9433552f36ad
Elliott Hughes [Tue, 10 May 2016 20:07:57 +0000 (20:07 +0000)]
Merge "Remove declaration of pthread_cond_timedwait_relative_np." am:
366164da10 am:
a7e53c57e6
am:
5da438bc3b
* commit '
5da438bc3b246a6dfb9739f9033fdf3419ef2b00':
Remove declaration of pthread_cond_timedwait_relative_np.
Change-Id: Id731a79b97246bfbe44ae9cc1ec3c3461696107b
Elliott Hughes [Tue, 10 May 2016 20:05:18 +0000 (20:05 +0000)]
Merge "Remove declaration of pthread_cond_timedwait_relative_np." am:
366164da10
am:
a7e53c57e6
* commit '
a7e53c57e62cf8ef557ccf2172539e5830831be0':
Remove declaration of pthread_cond_timedwait_relative_np.
Change-Id: I27ade05e72541dd20ad328a0ab5525294601d193
Elliott Hughes [Tue, 10 May 2016 20:01:57 +0000 (20:01 +0000)]
Merge "Remove declaration of pthread_cond_timedwait_relative_np."
am:
366164da10
* commit '
366164da10a0883ffbb5267cf619bcecbf92315d':
Remove declaration of pthread_cond_timedwait_relative_np.
Change-Id: Iae8eba095f510406aa8682eed966824fd5e2a5fb
Elliott Hughes [Tue, 10 May 2016 19:54:16 +0000 (19:54 +0000)]
Merge "Remove declaration of pthread_cond_timedwait_relative_np."
Dimitry Ivanov [Tue, 10 May 2016 00:37:39 +0000 (17:37 -0700)]
Remove linker-namespace functions from the header
They are intended for platform use only and we shouldn't have them
in the public header file.
Bug: http://b/
28174921
Change-Id: Ib9b3d0fa9442cfa2e784a693ad567d1444d774e5
Elliott Hughes [Mon, 9 May 2016 20:48:34 +0000 (20:48 +0000)]
Merge "Remove pthread_mutex_lock_timeout_np from <pthread.h>." am:
d2f3ce9c89 am:
209b22ae69 am:
f5fd82eb26
am:
4d6e341763
* commit '
4d6e34176319c9c4df295394adb2591f9ae3f15b':
Remove pthread_mutex_lock_timeout_np from <pthread.h>.
Change-Id: I5cc167ec473517b9efd0ca71e04bff5a6e5b71ed
Elliott Hughes [Mon, 9 May 2016 20:48:33 +0000 (20:48 +0000)]
Merge "Generalize the clone function slightly." am:
0155995e8d am:
6c8de255ec am:
3efddd4b9e
am:
bbab775d1d
* commit '
bbab775d1d26d0fa513e25afde2407aa8679f876':
Generalize the clone function slightly.
Change-Id: I7eb23660587d496c85f9604df71ce97449c19dca
Elliott Hughes [Mon, 9 May 2016 20:43:18 +0000 (20:43 +0000)]
Merge "Remove pthread_mutex_lock_timeout_np from <pthread.h>." am:
d2f3ce9c89 am:
209b22ae69
am:
f5fd82eb26
* commit '
f5fd82eb26af54418a13cff121af74fa3b7528b9':
Remove pthread_mutex_lock_timeout_np from <pthread.h>.
Change-Id: Ie34f58c8abe98507bd2828fb678bfed6dc1ee57f
Elliott Hughes [Mon, 9 May 2016 20:43:17 +0000 (20:43 +0000)]
Merge "Generalize the clone function slightly." am:
0155995e8d am:
6c8de255ec
am:
3efddd4b9e
* commit '
3efddd4b9e7571722cc9475e07d43b5fb100d47e':
Generalize the clone function slightly.
Change-Id: I3d45bb8f492904e0cc6c926ea37f9d5b23308286
Elliott Hughes [Mon, 9 May 2016 20:37:54 +0000 (20:37 +0000)]
Merge "Remove pthread_mutex_lock_timeout_np from <pthread.h>." am:
d2f3ce9c89
am:
209b22ae69
* commit '
209b22ae691390fefb269b0458accd1d6322a448':
Remove pthread_mutex_lock_timeout_np from <pthread.h>.
Change-Id: I8d95b44a0ec3a23481aca3c3d81ab6feec43042d
Elliott Hughes [Mon, 9 May 2016 20:37:53 +0000 (20:37 +0000)]
Merge "Generalize the clone function slightly." am:
0155995e8d
am:
6c8de255ec
* commit '
6c8de255ec0db2005d4d55ef4c8d307ceedb5fa1':
Generalize the clone function slightly.
Change-Id: I643485333465b6731e045f8824a1de0052721b12
Elliott Hughes [Mon, 9 May 2016 20:32:36 +0000 (20:32 +0000)]
Merge "Remove pthread_mutex_lock_timeout_np from <pthread.h>."
am:
d2f3ce9c89
* commit '
d2f3ce9c89715accb5b294f0c0a17b2a50656333':
Remove pthread_mutex_lock_timeout_np from <pthread.h>.
Change-Id: I9850ac8d00439cfebc5812db4df0dbd46963e6f3
Elliott Hughes [Mon, 9 May 2016 20:32:36 +0000 (20:32 +0000)]
Merge "Generalize the clone function slightly."
am:
0155995e8d
* commit '
0155995e8d4471d0e530c8bbfac88c4a8a68fbb1':
Generalize the clone function slightly.
Change-Id: I40b5ab2913811a7140a1104340f30aaedc8358fc
Elliott Hughes [Mon, 9 May 2016 20:29:26 +0000 (13:29 -0700)]
Remove declaration of pthread_cond_timedwait_relative_np.
It's been deprecated long enough, and nothing left in the tree (except
code that isn't even built) is still using it.
Bug: http://b/
27918161
Change-Id: Ibf824c1063d49484037de5c03b98bec5bdd4dcf6
Elliott Hughes [Mon, 9 May 2016 20:15:49 +0000 (20:15 +0000)]
Merge "Remove pthread_mutex_lock_timeout_np from <pthread.h>."
Elliott Hughes [Mon, 9 May 2016 20:14:50 +0000 (20:14 +0000)]
Merge "Generalize the clone function slightly."
Elliott Hughes [Sat, 7 May 2016 00:45:26 +0000 (17:45 -0700)]
Remove pthread_mutex_lock_timeout_np from <pthread.h>.
It's been deprecated long enough, and nothing left in the tree (except
code that isn't even built) is still using it.
Bug: http://b/
27918161
Change-Id: I1786f5e2528a23c17b3f7298f4ba5fc7761a26c5
Dimitry Ivanov [Sat, 7 May 2016 00:46:22 +0000 (00:46 +0000)]
Merge "Fix linker crash on trying to unload main executable am:
bee8572ca3 am:
396f05039a" into nyc-mr1-dev-plus-aosp
am:
940ddfde71
* commit '
940ddfde71840c22f4af0db356bacbc25bbb5327':
Change-Id: Ifc2cad68350f1eaa98f6f481fd357e907cbf4737
Dimitry Ivanov [Sat, 7 May 2016 00:46:22 +0000 (00:46 +0000)]
Fix linker crash on trying to unload main executable am:
bee8572ca3 am:
bb8a8758f0
am:
f68599d953
* commit '
f68599d953485d85bedd9cb8facb45954deb2876':
Fix linker crash on trying to unload main executable
Change-Id: I85895f04edab9ca4264312cb1713793c5b747284
Android Build Merger (Role) [Sat, 7 May 2016 00:41:22 +0000 (00:41 +0000)]
Merge "Fix linker crash on trying to unload main executable am:
bee8572ca3 am:
396f05039a" into nyc-mr1-dev-plus-aosp
Dimitry Ivanov [Sat, 7 May 2016 00:41:08 +0000 (00:41 +0000)]
Fix linker crash on trying to unload main executable am:
bee8572ca3
am:
bb8a8758f0
* commit '
bb8a8758f0d496a62f5e8af10eb4ff2b494cfdd1':
Fix linker crash on trying to unload main executable
Change-Id: Ia2d15a895f1eb03f24fba65c6e6180e54100a823
Dimitry Ivanov [Sat, 7 May 2016 00:41:08 +0000 (00:41 +0000)]
Fix linker crash on trying to unload main executable am:
bee8572ca3
am:
396f05039a
* commit '
396f05039a7185865808840bfbd21ba335323ca4':
Fix linker crash on trying to unload main executable
Change-Id: Ic00d54ba07124c25a564172bc0ec8d34f2801a61
Dimitry Ivanov [Sat, 7 May 2016 00:36:26 +0000 (00:36 +0000)]
Fix linker crash on trying to unload main executable
am:
bee8572ca3
* commit '
bee8572ca373f626ebe6cbcdd490808c054feb49':
Fix linker crash on trying to unload main executable
Change-Id: I0cf5b3d1c5e38bc14127d786217656805bd08e8b
Dimitry Ivanov [Sat, 7 May 2016 00:36:23 +0000 (00:36 +0000)]
Fix linker crash on trying to unload main executable
am:
bee8572ca3
* commit '
bee8572ca373f626ebe6cbcdd490808c054feb49':
Fix linker crash on trying to unload main executable
Change-Id: Icdc362ddd0126c2fe478914a315dace9562df7b3
Elliott Hughes [Sat, 7 May 2016 00:02:33 +0000 (00:02 +0000)]
Merge "End all lists in check-symbols-glibc.py with a ,." am:
1a26db8448 am:
eb8d8241a0 am:
138480339e
am:
3350a108cb
* commit '
3350a108cb6d4d1c3b2ebb88ddce391f94872f1e':
End all lists in check-symbols-glibc.py with a ,.
Change-Id: Ic209cd909fbb3c89fca82526450b77eedbaed62c
Elliott Hughes [Fri, 6 May 2016 23:57:53 +0000 (23:57 +0000)]
Merge "End all lists in check-symbols-glibc.py with a ,." am:
1a26db8448 am:
eb8d8241a0
am:
138480339e
* commit '
138480339e03e204b5189415d07c481b12e17c5a':
End all lists in check-symbols-glibc.py with a ,.
Change-Id: I9620d2808b832b6645b6de9c91ab96da9c561dd8
Elliott Hughes [Fri, 6 May 2016 23:53:06 +0000 (23:53 +0000)]
Merge "End all lists in check-symbols-glibc.py with a ,." am:
1a26db8448
am:
eb8d8241a0
* commit '
eb8d8241a02b9b613dba2d13323ed3f53d199fe3':
End all lists in check-symbols-glibc.py with a ,.
Change-Id: I403e1956201a426c9b2b23d92f2143b746657d50
Elliott Hughes [Fri, 6 May 2016 23:48:19 +0000 (23:48 +0000)]
Merge "End all lists in check-symbols-glibc.py with a ,."
am:
1a26db8448
* commit '
1a26db8448144a12bc9991b62d07105eae9bd156':
End all lists in check-symbols-glibc.py with a ,.
Change-Id: I003fce234cf56f3517e4c3f4e553d935fae09086
Elliott Hughes [Fri, 6 May 2016 22:55:36 +0000 (15:55 -0700)]
Generalize the clone function slightly.
* Allow clone where both the child function and stack are null. It's
obviously wrong to ask to call a function without a stack, but it's not
necessarily wrong to supply no stack if you're also not supplying a
function.
* Reimplement fork in terms of the clone function, rather than using the
clone system call directly.
This is intended as a step towards enabling use of pid namespaces.
Change-Id: I03c89bd1dc540d8b4ed1c8fdf6644290744b9e91
Treehugger Robot [Fri, 6 May 2016 23:35:21 +0000 (23:35 +0000)]
Merge "End all lists in check-symbols-glibc.py with a ,."
Dimitry Ivanov [Fri, 6 May 2016 23:28:38 +0000 (23:28 +0000)]
resolve merge conflicts of
46bb678 to nyc-dev-plus-aosp am:
3b1e7aa3ea
am:
0b8d835fd9
* commit '
0b8d835fd92018fe21fe41ed35a63ab99f722fa0':
Fix linker crash on trying to unload main executable
Change-Id: I7f18d22d3feb5d36b16d58d460188de4f8a0e1f0