OSDN Git Service

android-x86/bionic.git
8 years agoMerge "Fix <resolv.h> and <netinet/tcp.h> so dnscap builds." am: cb8ef17b07 am: 74a4b...
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

8 years agoMerge "Fix <resolv.h> and <netinet/tcp.h> so dnscap builds." am: cb8ef17b07
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

8 years agoMerge "Fix <resolv.h> and <netinet/tcp.h> so dnscap builds."
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

8 years agoMerge "Fix <resolv.h> and <netinet/tcp.h> so dnscap builds."
Elliott Hughes [Mon, 16 May 2016 21:59:50 +0000 (21:59 +0000)]
Merge "Fix <resolv.h> and <netinet/tcp.h> so dnscap builds."

8 years agoMerge "We have the _r ether_ntoa/ether_aton functions too." am: 20fc6ecf90 am: abaf7f0bb7
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

8 years agoMerge "We have the _r ether_ntoa/ether_aton functions too." am: 20fc6ecf90
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

8 years agoMerge "We have the _r ether_ntoa/ether_aton functions too."
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

8 years agoMerge "We have the _r ether_ntoa/ether_aton functions too."
Elliott Hughes [Mon, 16 May 2016 21:12:38 +0000 (21:12 +0000)]
Merge "We have the _r ether_ntoa/ether_aton functions too."

8 years agoFix <resolv.h> and <netinet/tcp.h> so dnscap builds.
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

8 years agoWe have the _r ether_ntoa/ether_aton functions too.
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

8 years agoMerge "Fix our *ether* headers mess." am: e79b630daa am: 4d9f4086bd
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

8 years agoMerge "Fix our *ether* headers mess." am: e79b630daa
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

8 years agoMerge "Fix our *ether* headers mess."
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

8 years agoMerge "Fix our *ether* headers mess."
Elliott Hughes [Mon, 16 May 2016 20:00:09 +0000 (20:00 +0000)]
Merge "Fix our *ether* headers mess."

8 years agoFix 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

8 years agoMerge "Update Android.bp to match Android.mk" am: 56469e8de2 am: d39c529186
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

8 years agoMerge "Update Android.bp to match Android.mk" am: 56469e8de2
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

8 years agoMerge "Update Android.bp to match Android.mk"
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

8 years agoMerge "Update Android.bp to match Android.mk"
Treehugger Robot [Thu, 12 May 2016 22:15:00 +0000 (22:15 +0000)]
Merge "Update Android.bp to match Android.mk"

8 years agoUpdate 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

8 years agoMerge "Always update search domain paths. am: b0cfefac91 am: 6e1729f7aa" into nyc...
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

8 years agoAlways update search domain paths. am: b0cfefac91
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

8 years agoAlways update search domain paths. am: b0cfefac91
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

8 years agoAlways update search domain paths.
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

8 years agoAlways update search domain paths.
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

8 years agoMerge "Always update search domain paths." am: 6db7e5a10d am: f0d6097189
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

8 years agoMerge "Always update search domain paths." am: 6db7e5a10d
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

8 years agoMerge "Always update search domain paths."
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

8 years agoAlways update search domain paths.
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)

8 years agoMerge "Always update search domain paths."
Pierre Imai [Thu, 12 May 2016 02:51:23 +0000 (02:51 +0000)]
Merge "Always update search domain paths."

8 years agoMerge "Remove <net/if_types.h>." am: b277bb755a am: a3c6190bad
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

8 years agoMerge "Remove <net/if_types.h>." am: b277bb755a
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

8 years agoMerge "Remove <net/if_types.h>."
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

8 years agoMerge "Remove <net/if_types.h>."
Elliott Hughes [Thu, 12 May 2016 02:23:42 +0000 (02:23 +0000)]
Merge "Remove <net/if_types.h>."

8 years agoresolve merge conflicts of 19b669b to nyc-dev-plus-aosp
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

8 years agoresolve merge conflicts of 55d9927 to nyc-mr1-dev-plus-aosp
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

8 years agoresolve merge conflicts of 19b669b to nyc-dev-plus-aosp
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

8 years agoRemove linker-namespace functions from the header
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

8 years agoMerge "Remove various bits of header cruft." am: d0b173316a am: cff5daca20
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

8 years agoRemove <net/if_types.h>.
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

8 years agoMerge "Remove various bits of header cruft." am: d0b173316a
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

8 years agoMerge "Remove various bits of header cruft."
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

8 years agoMerge "Remove linker-namespace functions from the header" am: 35c115c196 am: d118a32058
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

8 years agoMerge "Remove linker-namespace functions from the header" am: 35c115c196
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

8 years agoMerge "Remove various bits of header cruft."
Elliott Hughes [Wed, 11 May 2016 21:25:01 +0000 (21:25 +0000)]
Merge "Remove various bits of header cruft."

8 years agoMerge "Remove linker-namespace functions from the header"
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

8 years agoRemove linker-namespace functions from the header
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)

8 years agoMerge "Remove linker-namespace functions from the header"
Dimitry Ivanov [Wed, 11 May 2016 21:14:41 +0000 (21:14 +0000)]
Merge "Remove linker-namespace functions from the header"

8 years agoAlways update search domain paths.
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

8 years agoRemove various bits of header cruft.
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

8 years agoMerge "Remove declaration of pthread_cond_timedwait_relative_np." am: 366164da10...
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

8 years agoMerge "Remove declaration of pthread_cond_timedwait_relative_np." am: 366164da10
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

8 years agoMerge "Remove declaration of pthread_cond_timedwait_relative_np."
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

8 years agoMerge "Remove declaration of pthread_cond_timedwait_relative_np."
Elliott Hughes [Tue, 10 May 2016 19:54:16 +0000 (19:54 +0000)]
Merge "Remove declaration of pthread_cond_timedwait_relative_np."

8 years agoRemove linker-namespace functions from the header
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

8 years agoMerge "Remove pthread_mutex_lock_timeout_np from <pthread.h>." am: d2f3ce9c89 am...
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

8 years agoMerge "Generalize the clone function slightly." am: 0155995e8d am: 6c8de255ec
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

8 years agoMerge "Remove pthread_mutex_lock_timeout_np from <pthread.h>." am: d2f3ce9c89
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

8 years agoMerge "Generalize the clone function slightly." am: 0155995e8d
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

8 years agoMerge "Remove pthread_mutex_lock_timeout_np from <pthread.h>."
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

8 years agoMerge "Generalize the clone function slightly."
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

8 years agoRemove declaration of pthread_cond_timedwait_relative_np.
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

8 years agoMerge "Remove pthread_mutex_lock_timeout_np from <pthread.h>."
Elliott Hughes [Mon, 9 May 2016 20:15:49 +0000 (20:15 +0000)]
Merge "Remove pthread_mutex_lock_timeout_np from <pthread.h>."

8 years agoMerge "Generalize the clone function slightly."
Elliott Hughes [Mon, 9 May 2016 20:14:50 +0000 (20:14 +0000)]
Merge "Generalize the clone function slightly."

8 years agoRemove pthread_mutex_lock_timeout_np from <pthread.h>.
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

8 years agoMerge "Fix linker crash on trying to unload main executable am: bee8572ca3 am: 396f05...
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

8 years agoFix linker crash on trying to unload main executable am: bee8572ca3
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

8 years agoFix linker crash on trying to unload main executable am: bee8572ca3
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

8 years agoFix linker crash on trying to unload main executable
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

8 years agoFix linker crash on trying to unload main executable
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

8 years agoMerge "End all lists in check-symbols-glibc.py with a ,." am: 1a26db8448 am: eb8d8241a0
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

8 years agoMerge "End all lists in check-symbols-glibc.py with a ,." am: 1a26db8448
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

8 years agoMerge "End all lists in check-symbols-glibc.py with a ,."
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

8 years agoGeneralize the clone function slightly.
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

8 years agoMerge "End all lists in check-symbols-glibc.py with a ,."
Treehugger Robot [Fri, 6 May 2016 23:35:21 +0000 (23:35 +0000)]
Merge "End all lists in check-symbols-glibc.py with a ,."

8 years agoresolve merge conflicts of 46bb678 to nyc-dev-plus-aosp
Dimitry Ivanov [Fri, 6 May 2016 23:22:28 +0000 (23:22 +0000)]
resolve merge conflicts of 46bb678 to nyc-dev-plus-aosp
am: 3b1e7aa3ea

* commit '3b1e7aa3eac79edf306fddf13c09e0c3a84d26c7':
  Fix linker crash on trying to unload main executable

Change-Id: Ia3f865e66759da40240c6c662655559d77079368

8 years agoresolve merge conflicts of 46bb678 to nyc-dev-plus-aosp
Dimitry Ivanov [Fri, 6 May 2016 23:14:31 +0000 (16:14 -0700)]
resolve merge conflicts of 46bb678 to nyc-dev-plus-aosp

Change-Id: I5130a0eef7806467636a41e3403c29061774930a

8 years agoFix linker crash on trying to unload main executable
Dimitry Ivanov [Thu, 5 May 2016 00:19:14 +0000 (17:19 -0700)]
Fix linker crash on trying to unload main executable

Linker crashed if linking of the main executable fails
instead of aborting with readable error message.

This patch modifies unload to soinfo_unload it all at once
in this particular case. This helps avoid situations when
one of the libraries on the DT_NEEDED list of main executable
has gotten unloaded by previous library unload because it
DT_NEEDED it too.

Example (consider following dependency tree):
main_executable
|-> liba.so
  |-> libb.so
|-> libb.so

The list of the libraries need to be unloaded in this case
is [liba.so, libb.so], but if linker does unload one by one
by the time it gets to libb.so - the soinfo for the library
is already unloaded (and the segments were unmapped).

Passing everything as an array helps soinfo_unload to check
if a library was already unloaded by looking into local_unload_list.

Bug: http://b/28565608
Change-Id: I7199290e10a186057dcf3b7b68dbce954af7dba1
(cherry picked from commit 83fcb542088db7874a387f4f41caac2019821fd2)

8 years agoMerge "Remove a duplicate declaration, improve check-symbols-glibc.py." am: 5ac45a2ad...
Elliott Hughes [Fri, 6 May 2016 23:02:22 +0000 (23:02 +0000)]
Merge "Remove a duplicate declaration, improve check-symbols-glibc.py." am: 5ac45a2add am: 58df16b0b4
am: 026295c35d

* commit '026295c35d209c59d5eb0a305d523e8169b7ff9f':
  Remove a duplicate declaration, improve check-symbols-glibc.py.

Change-Id: Ie1d5fe368ef47c88653f1479a9019d998df89183

8 years agoMerge "Fix linker crash on trying to unload main executable"
Dimitry Ivanov [Fri, 6 May 2016 23:02:20 +0000 (23:02 +0000)]
Merge "Fix linker crash on trying to unload main executable"
am: e37212f3a3

* commit 'e37212f3a3cadbab5a9a5828481b73e594e57058':
  Fix linker crash on trying to unload main executable

Change-Id: Ie561115e10acc80bff3ed85ede554318b4c97152

8 years agoMerge "Remove a duplicate declaration, improve check-symbols-glibc.py." am: 5ac45a2add
Elliott Hughes [Fri, 6 May 2016 22:57:32 +0000 (22:57 +0000)]
Merge "Remove a duplicate declaration, improve check-symbols-glibc.py." am: 5ac45a2add
am: 58df16b0b4

* commit '58df16b0b42ec00b5cda08a9d6863a2e7e5971d6':
  Remove a duplicate declaration, improve check-symbols-glibc.py.

Change-Id: I12c8e036c8900c861a1c48e6fd6734f670653369

8 years agoMerge "Fix linker crash on trying to unload main executable"
Dimitry Ivanov [Fri, 6 May 2016 22:52:42 +0000 (22:52 +0000)]
Merge "Fix linker crash on trying to unload main executable"

8 years agoMerge "Remove a duplicate declaration, improve check-symbols-glibc.py."
Elliott Hughes [Fri, 6 May 2016 22:52:22 +0000 (22:52 +0000)]
Merge "Remove a duplicate declaration, improve check-symbols-glibc.py."
am: 5ac45a2add

* commit '5ac45a2add41fd7c1640815accf09a29bd14aac6':
  Remove a duplicate declaration, improve check-symbols-glibc.py.

Change-Id: I3e2b8574b2b757b8546c69a5985d1af678f0dfdb

8 years agoEnd all lists in check-symbols-glibc.py with a ,.
Elliott Hughes [Fri, 6 May 2016 22:44:26 +0000 (15:44 -0700)]
End all lists in check-symbols-glibc.py with a ,.

Change-Id: I85f591c51e32fa001e611a035e2e51305c837d22

8 years agoMerge "Remove a duplicate declaration, improve check-symbols-glibc.py."
Treehugger Robot [Fri, 6 May 2016 22:42:11 +0000 (22:42 +0000)]
Merge "Remove a duplicate declaration, improve check-symbols-glibc.py."

8 years agoMerge "Re-land "Fix invalid using decl in bionic relocation_packer"" am: f67dcc8f9d...
rnk [Fri, 6 May 2016 22:32:23 +0000 (22:32 +0000)]
Merge "Re-land "Fix invalid using decl in bionic relocation_packer"" am: f67dcc8f9d am: 03a1031919
am: 55b60ccfc1

* commit '55b60ccfc1f40a92d2adc55cfb602c9b6cea9ca0':
  Re-land "Fix invalid using decl in bionic relocation_packer"

Change-Id: Ie74b724bc55fc02e88966d6920c80353651299a7

8 years agoMerge "Re-land "Fix invalid using decl in bionic relocation_packer"" am: f67dcc8f9d
rnk [Fri, 6 May 2016 22:27:06 +0000 (22:27 +0000)]
Merge "Re-land "Fix invalid using decl in bionic relocation_packer"" am: f67dcc8f9d
am: 03a1031919

* commit '03a103191923728f2f66d24b7e1d2b1fbdc0a456':
  Re-land "Fix invalid using decl in bionic relocation_packer"

Change-Id: I380694fdb81e38dfa62801caecfd8bf8bf0319c5

8 years agoMerge "Re-land "Fix invalid using decl in bionic relocation_packer""
rnk [Fri, 6 May 2016 22:22:14 +0000 (22:22 +0000)]
Merge "Re-land "Fix invalid using decl in bionic relocation_packer""
am: f67dcc8f9d

* commit 'f67dcc8f9d079bb2b8e51386db41f362788f820c':
  Re-land "Fix invalid using decl in bionic relocation_packer"

Change-Id: Id0501cba14af0cebeb2da6d63179256d3e542847

8 years agoMerge "Re-land "Fix invalid using decl in bionic relocation_packer""
Treehugger Robot [Fri, 6 May 2016 22:08:31 +0000 (22:08 +0000)]
Merge "Re-land "Fix invalid using decl in bionic relocation_packer""

8 years agoMerge "Remove --exclude-libs ldflags." am: 96029e30ce am: 4bdac0d684
Dan Albert [Fri, 6 May 2016 22:03:15 +0000 (22:03 +0000)]
Merge "Remove --exclude-libs ldflags." am: 96029e30ce am: 4bdac0d684
am: 482e042200

* commit '482e04220072fca71a915284ab468671c8ddd9eb':
  Remove --exclude-libs ldflags.

Change-Id: Ic5ede2edac5dda4bb98249bc79d2eb8f0a85cb9f

8 years agoMerge "Remove --exclude-libs ldflags." am: 96029e30ce
Dan Albert [Fri, 6 May 2016 21:58:15 +0000 (21:58 +0000)]
Merge "Remove --exclude-libs ldflags." am: 96029e30ce
am: 4bdac0d684

* commit '4bdac0d68418ad995fa869fd36e38e18281af2f5':
  Remove --exclude-libs ldflags.

Change-Id: I8ee199154ac8e2f3ee1d028fc6ccea106b65f956

8 years agoMerge "Remove --exclude-libs ldflags."
Dan Albert [Fri, 6 May 2016 21:53:17 +0000 (21:53 +0000)]
Merge "Remove --exclude-libs ldflags."
am: 96029e30ce

* commit '96029e30cea4c5eb67ce61f3cddc1805f1262222':
  Remove --exclude-libs ldflags.

Change-Id: I654a829957ae60d29b59ae74edf62a1d9683d877

8 years agoFix linker crash on trying to unload main executable
Dimitry Ivanov [Thu, 5 May 2016 00:19:14 +0000 (17:19 -0700)]
Fix linker crash on trying to unload main executable

Linker crashed if linking of the main executable fails
instead of aborting with readable error message.

This patch modifies unload to soinfo_unload it all at once
in this particular case. This helps avoid situations when
one of the libraries on the DT_NEEDED list of main executable
has gotten unloaded by previous library unload because it
DT_NEEDED it too.

Example (consider following dependency tree):
main_executable
|-> liba.so
  |-> libb.so
|-> libb.so

The list of the libraries need to be unloaded in this case
is [liba.so, libb.so], but if linker does unload one by one
by the time it gets to libb.so - the soinfo for the library
is already unloaded (and the segments were unmapped).

Passing everything as an array helps soinfo_unload to check
if a library was already unloaded by looking into local_unload_list.

Bug: http://b/28565608
Change-Id: I7199290e10a186057dcf3b7b68dbce954af7dba1

8 years agoRemove a duplicate declaration, improve check-symbols-glibc.py.
Elliott Hughes [Fri, 6 May 2016 21:43:50 +0000 (14:43 -0700)]
Remove a duplicate declaration, improve check-symbols-glibc.py.

Change-Id: I97a98dfc8acaa93172386b4475487a05a35a9337

8 years agoMerge "Remove --exclude-libs ldflags."
Treehugger Robot [Fri, 6 May 2016 21:41:26 +0000 (21:41 +0000)]
Merge "Remove --exclude-libs ldflags."

8 years agoRe-land "Fix invalid using decl in bionic relocation_packer"
rnk [Thu, 5 May 2016 23:44:34 +0000 (16:44 -0700)]
Re-land "Fix invalid using decl in bionic relocation_packer"

This time with more namespace qualification.

Tested manually by building clang_x64/android_relocation_packer locally,
as the Android trybot analyze step does not think it needs to run for
this change.

Original description:

> The code was essentially doing 'using Logger::INFO' in the global
> namespace to make its 'LOG(INFO)' macros work. Unfortunately, C++ does
> not allow you to use using decls on classes like this unless you are in
> a derived class. GCC does not accept this code, and Clang was recently
> updated (LLVM r268594) to reject it as well.
>
> This should fix the Chromium Android ASan build with TOT Clang:
> https://build.chromium.org/p/chromium.fyi/builders/ClangToTAndroidASan/

TBR=thakis@chromium.org,sgurun@chromium.org
BUG=609543

Review-Url: https://codereview.chromium.org/1952353005
Cr-Commit-Position: refs/heads/master@{#391952}
(cherry picked from commit 5762af8ad13e62957493c3e4314a234ee57a4200)

Change-Id: Ibc6f6023aef028c5029be128ac799dc67fc6683c

8 years agoRemove --exclude-libs ldflags.
Dan Albert [Fri, 18 Sep 2015 17:41:54 +0000 (10:41 -0700)]
Remove --exclude-libs ldflags.

This is now done by default in the build system.

The comments say don't do this, but we have linker scripts that
protect the few symbols we have to actually keep now.

Bug: http://b/24166967
Change-Id: Iff1beeb0f54f80b23fb1561f37a39f208e0bf676

8 years agoMerge "Use clang\'s nullability instead of nonnull." am: 98ac6f415f am: 34c417f2a5
Dan Albert [Fri, 6 May 2016 02:48:47 +0000 (02:48 +0000)]
Merge "Use clang\'s nullability instead of nonnull." am: 98ac6f415f am: 34c417f2a5
am: 3d4973f96d

* commit '3d4973f96d4a4ab7fc2848da53ccdc9da3a56cbb':
  Use clang's nullability instead of nonnull.

Change-Id: Ifb4526cdbf2dbf0fb462d8a8223f668f92e5c874

8 years agoMerge "Use clang\'s nullability instead of nonnull." am: 98ac6f415f
Dan Albert [Fri, 6 May 2016 02:44:10 +0000 (02:44 +0000)]
Merge "Use clang\'s nullability instead of nonnull." am: 98ac6f415f
am: 34c417f2a5

* commit '34c417f2a5abb53486a54b6b6ab800c0621f9cd7':
  Use clang's nullability instead of nonnull.

Change-Id: Ibed696d2f74ecb0c7bd36ca8c22ba792e50090a8

8 years agoMerge "Use clang\'s nullability instead of nonnull."
Dan Albert [Fri, 6 May 2016 02:39:07 +0000 (02:39 +0000)]
Merge "Use clang\'s nullability instead of nonnull."
am: 98ac6f415f

* commit '98ac6f415f4cd68be6691c1d04f59a76af802485':
  Use clang's nullability instead of nonnull.

Change-Id: I594fce602b20b2b8acaa7f99e1c3cb3f053d26e7