OSDN Git Service
Android Build Merger (Role) [Thu, 19 May 2016 18:20:51 +0000 (18:20 +0000)]
Merge "Merge "Do not check zip-entry validity on create_namespace" into nyc-dev am:
c912ed0519 am:
6f0b607cdd" into nyc-mr1-dev-plus-aosp
Dimitry Ivanov [Thu, 19 May 2016 18:20:34 +0000 (18:20 +0000)]
Merge "Do not check zip-entry validity on create_namespace" into nyc-dev am:
c912ed0519
am:
10b9ae6dbb
* commit '
10b9ae6dbb06db6c1a1f05fa2895a705f041b2ac':
Do not check zip-entry validity on create_namespace
Change-Id: If08a62157167bd749d20b1bc7cd3a269c1969711
Dimitry Ivanov [Thu, 19 May 2016 18:20:34 +0000 (18:20 +0000)]
Merge "Do not check zip-entry validity on create_namespace" into nyc-dev am:
c912ed0519
am:
6f0b607cdd
* commit '
6f0b607cdd4bcd24b99e328fecf40763b47683ef':
Do not check zip-entry validity on create_namespace
Change-Id: I230ed113d69fee1c7a92d13fa14329c1e7d511ac
Dimitry Ivanov [Thu, 19 May 2016 18:14:01 +0000 (18:14 +0000)]
Merge "Do not check zip-entry validity on create_namespace" into nyc-dev
am:
c912ed0519
* commit '
c912ed05196d18b4f9ce0876b52b600437d1b497':
Do not check zip-entry validity on create_namespace
Change-Id: I2690af1feed2f5dcd2917b32b43cd84112485afd
Dimitry Ivanov [Thu, 19 May 2016 18:14:00 +0000 (18:14 +0000)]
Merge "Do not check zip-entry validity on create_namespace" into nyc-dev
am:
c912ed0519
* commit '
c912ed05196d18b4f9ce0876b52b600437d1b497':
Do not check zip-entry validity on create_namespace
Change-Id: Icda7971bc067b1dd71b9bc16afaa309c503d9d16
Dimitry Ivanov [Thu, 19 May 2016 17:46:10 +0000 (17:46 +0000)]
Merge "Do not check zip-entry validity on create_namespace" into nyc-dev
Dimitry Ivanov [Thu, 19 May 2016 01:14:19 +0000 (18:14 -0700)]
Do not check zip-entry validity on create_namespace
This operation is the most expensive one and since it is
unlikely that the zip-entry name is invalid (given that it
is constructed by the platform) - it can removed.
The worst case scenario is dlopen() of non-existing libraries
taking more time. And this use-case is not on the critical path.
Bug: http://b/
28801010
Change-Id: I10a6b0bf342404ab72f0f5102ebf19f6c06ee6bf
Android Build Merger (Role) [Thu, 19 May 2016 02:22:20 +0000 (02:22 +0000)]
Merge "Merge "Run fsync tests on mutable filesystem." into marshmallow-cts-dev am:
de1f02c028 am:
0fab155cf8 am:
b46bb761d5 am:
1e44a6e1ed am:
97ecf98be3 am:
e9cb77f082 am:
650810a879" into nyc-mr1-dev-plus-aosp
Shuhei Takahashi [Thu, 19 May 2016 02:22:10 +0000 (02:22 +0000)]
Merge "Run fsync tests on mutable filesystem." into marshmallow-cts-dev am:
de1f02c028 am:
0fab155cf8 am:
b46bb761d5 am:
1e44a6e1ed am:
97ecf98be3 am:
e9cb77f082
am:
c46fcdb5d3
* commit '
c46fcdb5d33d264021a624e958277f531667141a':
Run fsync tests on mutable filesystem.
Change-Id: I9dd4abdd3c60962b0f6afbd74cb2742a502face3
Shuhei Takahashi [Thu, 19 May 2016 02:22:09 +0000 (02:22 +0000)]
Merge "Run fsync tests on mutable filesystem." into marshmallow-cts-dev am:
de1f02c028 am:
0fab155cf8 am:
b46bb761d5 am:
1e44a6e1ed am:
97ecf98be3 am:
e9cb77f082
am:
650810a879
* commit '
650810a8796e736d97ea81f14fa5ad8c0c58603f':
Run fsync tests on mutable filesystem.
Change-Id: Icf1065dca30e678db9e90271f991ebdb2119dfca
Daniel Xie [Thu, 19 May 2016 02:19:12 +0000 (02:19 +0000)]
Merge "Run fsync tests on mutable filesystem." into marshmallow-cts-dev am:
de1f02c028 am:
0fab155cf8 am:
b46bb761d5 am:
1e44a6e1ed am:
97ecf98be3
am:
e9cb77f082
* commit '
e9cb77f082c224f31c4c4d04a613594f459a94b8':
Run fsync tests on mutable filesystem.
Change-Id: I521a216ed29d6f4cb4596ef73e83fbbf4bf73d4a
Daniel Xie [Thu, 19 May 2016 02:19:12 +0000 (02:19 +0000)]
Merge "Run fsync tests on mutable filesystem." into marshmallow-cts-dev am:
de1f02c028 am:
0fab155cf8 am:
b46bb761d5 am:
1e44a6e1ed am:
97ecf98be3
am:
e9cb77f082
* commit '
e9cb77f082c224f31c4c4d04a613594f459a94b8':
Run fsync tests on mutable filesystem.
Change-Id: I0e97fa4e8eb4daf50beb6b1051ae8934deb2fb60
Shuhei Takahashi [Thu, 19 May 2016 02:16:14 +0000 (02:16 +0000)]
Merge "Run fsync tests on mutable filesystem." into marshmallow-cts-dev am:
de1f02c028 am:
0fab155cf8 am:
b46bb761d5 am:
1e44a6e1ed
am:
97ecf98be3
* commit '
97ecf98be3efaf196b19fc98e14dbbbc0e58c373':
Run fsync tests on mutable filesystem.
Change-Id: Id8b620cdc55da0bd2f473a176eac0fb921369d32
Daniel Xie [Thu, 19 May 2016 02:13:12 +0000 (02:13 +0000)]
Merge "Run fsync tests on mutable filesystem." into marshmallow-cts-dev am:
de1f02c028 am:
0fab155cf8 am:
b46bb761d5
am:
1e44a6e1ed
* commit '
1e44a6e1ed6321510d8fbb48bc618a376fc93cc4':
Run fsync tests on mutable filesystem.
Change-Id: If4ffd6e00b4f6c5d099fea3b20027efd72256ce6
Shuhei Takahashi [Thu, 19 May 2016 02:10:13 +0000 (02:10 +0000)]
Merge "Run fsync tests on mutable filesystem." into marshmallow-cts-dev am:
de1f02c028 am:
0fab155cf8
am:
b46bb761d5
* commit '
b46bb761d50e2b0cfe8ae597e202a7e05b0eaa5a':
Run fsync tests on mutable filesystem.
Change-Id: I212ee7226d5a5aa942696c96a49d2f74b1be9c93
Daniel Xie [Thu, 19 May 2016 02:07:14 +0000 (02:07 +0000)]
Merge "Run fsync tests on mutable filesystem." into marshmallow-cts-dev am:
de1f02c028
am:
0fab155cf8
* commit '
0fab155cf861ee12e8b01b6339ef56524d56ebe1':
Run fsync tests on mutable filesystem.
Change-Id: Iadcaa7329c8ace2a898860dce99ae1a9cf5f2757
Shuhei Takahashi [Thu, 19 May 2016 02:04:05 +0000 (02:04 +0000)]
Merge "Run fsync tests on mutable filesystem." into marshmallow-cts-dev
am:
de1f02c028
* commit '
de1f02c02815c06a6123e0d857ca217534ffbd47':
Run fsync tests on mutable filesystem.
Change-Id: I0e1cb73b9bde33672a1ef944b75c8bb180976304
Daniel Xie [Thu, 19 May 2016 01:57:22 +0000 (01:57 +0000)]
Merge "Run fsync tests on mutable filesystem." into marshmallow-cts-dev
Colin Cross [Wed, 18 May 2016 22:14:54 +0000 (22:14 +0000)]
Merge "Force clang for bionic" am:
7d99bd38e4 am:
3eed7d1c8f
am:
c4a82b43ed
* commit '
c4a82b43edefb1c6d30fd529f3947a2ce315046d':
Force clang for bionic
Change-Id: I7441cbc1db7c09039dcd60882e105d7e2feccda7
Colin Cross [Wed, 18 May 2016 22:09:41 +0000 (22:09 +0000)]
Merge "Force clang for bionic" am:
7d99bd38e4
am:
3eed7d1c8f
* commit '
3eed7d1c8f7383b9cbe331ee4d9d24785a618bd4':
Force clang for bionic
Change-Id: Ic4ba74a03a5c78670fbcec46e8b1b1d39f7d3659
Colin Cross [Wed, 18 May 2016 22:07:07 +0000 (22:07 +0000)]
Merge "Force clang for bionic"
am:
7d99bd38e4
* commit '
7d99bd38e479170d4d1d2e55c5df97b1cacaebfd':
Force clang for bionic
Change-Id: Ib6665e40ab6c23861ded88d4b29c6bb6ae7b970c
Treehugger Robot [Wed, 18 May 2016 21:58:58 +0000 (21:58 +0000)]
Merge "Force clang for bionic"
Colin Cross [Wed, 18 May 2016 21:06:22 +0000 (14:06 -0700)]
Force clang for bionic
Bionic will only compile with clang, and Android.mk files force clang,
turn it on in Android.bp.
Change-Id: I9db06298adfeab4eeef031d88aa310776cad3af0
Android Build Merger (Role) [Wed, 18 May 2016 07:43:14 +0000 (07:43 +0000)]
Merge "Merge "Fix dlopen of main executable by absolute path" into nyc-dev am:
041cf17cdd am:
a6002eb9a2" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 18 May 2016 07:43:08 +0000 (07:43 +0000)]
Merge "linker: Allow caller to specify parent namespace am:
49cfc899a3 am:
49b0da992c" into nyc-mr1-dev-plus-aosp
Dimitry Ivanov [Wed, 18 May 2016 07:42:44 +0000 (07:42 +0000)]
Merge "Fix dlopen of main executable by absolute path" into nyc-dev am:
041cf17cdd
am:
a6002eb9a2
* commit '
a6002eb9a27913497ec69eeaf7d9a7537d3f99d3':
Fix dlopen of main executable by absolute path
Change-Id: Ie7b71f2b0012573189315f318d405dec8b781ef9
Dimitry Ivanov [Wed, 18 May 2016 07:42:41 +0000 (07:42 +0000)]
Merge "Fix dlopen of main executable by absolute path" into nyc-dev am:
041cf17cdd
am:
d118c2e0d3
* commit '
d118c2e0d309c22c89254aac1a1a16543bf25e9b':
Fix dlopen of main executable by absolute path
Change-Id: I83e2d3c032dc14b37d5519d8695f625e216056e8
Dimitry Ivanov [Wed, 18 May 2016 07:42:36 +0000 (07:42 +0000)]
linker: Allow caller to specify parent namespace am:
49cfc899a3
am:
49b0da992c
* commit '
49b0da992c9b66007a38cfe68ee7569c3a69b543':
linker: Allow caller to specify parent namespace
Change-Id: I8cfbd7cb3acce4c4924f5f2686601606d42853b9
Dimitry Ivanov [Wed, 18 May 2016 07:42:35 +0000 (07:42 +0000)]
linker: Allow caller to specify parent namespace am:
49cfc899a3
am:
0e3ce0ef3b
* commit '
0e3ce0ef3b8762a34b10b57ee031ec4a5ff027c4':
linker: Allow caller to specify parent namespace
Change-Id: Ia6a567ffdef4ff116262202dcf27b5a9990a95cb
Dimitry Ivanov [Wed, 18 May 2016 07:40:10 +0000 (07:40 +0000)]
Merge "Fix dlopen of main executable by absolute path" into nyc-dev
am:
041cf17cdd
* commit '
041cf17cdd900f807d8d39d04802e9f31f2ffd74':
Fix dlopen of main executable by absolute path
Change-Id: I1d543ce0d14da2c20783fe179a7ce675010cac3d
Dimitry Ivanov [Wed, 18 May 2016 07:40:09 +0000 (07:40 +0000)]
Merge "Fix dlopen of main executable by absolute path" into nyc-dev
am:
041cf17cdd
* commit '
041cf17cdd900f807d8d39d04802e9f31f2ffd74':
Fix dlopen of main executable by absolute path
Change-Id: Ie58e2eab44e7234a320dd85eaaa7df853bccab1b
Dimitry Ivanov [Wed, 18 May 2016 07:40:04 +0000 (07:40 +0000)]
linker: Allow caller to specify parent namespace
am:
49cfc899a3
* commit '
49cfc899a3708fae9175e44c0c02cd479fda8b36':
linker: Allow caller to specify parent namespace
Change-Id: I39a3d549a881dc66877bd051956b54be617c25b5
Dimitry Ivanov [Wed, 18 May 2016 07:40:03 +0000 (07:40 +0000)]
linker: Allow caller to specify parent namespace
am:
49cfc899a3
* commit '
49cfc899a3708fae9175e44c0c02cd479fda8b36':
linker: Allow caller to specify parent namespace
Change-Id: I175d6a9be50e843a5e2dc3d4cf16c19e1eb6feaa
Dimitry Ivanov [Wed, 18 May 2016 07:33:50 +0000 (07:33 +0000)]
Merge "Fix dlopen of main executable by absolute path" into nyc-dev
Dimitry Ivanov [Tue, 17 May 2016 23:16:50 +0000 (23:16 +0000)]
Merge "linker: Allow caller to specify parent namespace" am:
42abf3d241 am:
88bdbe4726
am:
9b94d7de59
* commit '
9b94d7de59b2dbd8d89d8162b3441fffec2d37e5':
linker: Allow caller to specify parent namespace
Change-Id: Ia19a6baec69be3666f1f8e89dfa7df9d849c7f10
Dimitry Ivanov [Tue, 17 May 2016 23:13:31 +0000 (23:13 +0000)]
Merge "linker: Allow caller to specify parent namespace" am:
42abf3d241
am:
88bdbe4726
* commit '
88bdbe4726141d8ee1aa447a55f737cee015aee7':
linker: Allow caller to specify parent namespace
Change-Id: Ib429a07741555c794a856a1324570e2bc0a5d91a
Dimitry Ivanov [Tue, 17 May 2016 23:13:31 +0000 (23:13 +0000)]
Merge "Fix dlopen of main executable by absolute path" am:
49fbce11e6 am:
9854a94127
am:
98d8b461e0
* commit '
98d8b461e06dc52e2b416fffd8871c1d0e39c2da':
Fix dlopen of main executable by absolute path
Change-Id: Ib2ca84e998894ed3404ee92a563fa3c493fa2962
Dimitry Ivanov [Tue, 17 May 2016 23:05:37 +0000 (23:05 +0000)]
Merge "linker: Allow caller to specify parent namespace"
am:
42abf3d241
* commit '
42abf3d241b8fd59c3911bd04f13cd4e40e46448':
linker: Allow caller to specify parent namespace
Change-Id: I4ed03d4b426f004a0fd1668c12dd4990c39c02cb
Dimitry Ivanov [Tue, 17 May 2016 23:05:36 +0000 (23:05 +0000)]
Merge "Fix dlopen of main executable by absolute path" am:
49fbce11e6
am:
9854a94127
* commit '
9854a94127290e798a97dea3de10f5def106d1a8':
Fix dlopen of main executable by absolute path
Change-Id: I9e7570832f6db0a3d768aab8d0cf5420071f6295
Dimitry Ivanov [Thu, 12 May 2016 22:20:21 +0000 (15:20 -0700)]
linker: Allow caller to specify parent namespace
This change enables apps to share libraries opened
with RTLD_GLOBAL between different classloader namespaces.
The new parameter to create_namespace allows native_loader
to instruct the linker to share libraries belonging to
global group from a specified namespace instead of
using the caller_ns.
Bug: http://b/
28560538
Bug: https://code.google.com/p/android/issues/detail?id=208458
Change-Id: I5d0c62730bbed19cdeb16c7559c74aa262a2475f
(cherry picked from commit
fc2da53440383fe1026e0eb287d643b577c2707d)
Dimitry Ivanov [Tue, 17 May 2016 22:57:38 +0000 (22:57 +0000)]
Merge "Fix dlopen of main executable by absolute path"
am:
49fbce11e6
* commit '
49fbce11e6373ad4a791d44a678f37ecb9498ba2':
Fix dlopen of main executable by absolute path
Change-Id: Ie39b2efedff37ea7fc8b8a55573a557e2bf7cd15
Treehugger Robot [Tue, 17 May 2016 22:43:00 +0000 (22:43 +0000)]
Merge "linker: Allow caller to specify parent namespace"
Dimitry Ivanov [Tue, 17 May 2016 20:29:37 +0000 (13:29 -0700)]
Fix dlopen of main executable by absolute path
This CL adds initialization of inode for the main executable
which enables linker to resolve the correct soinfo when
application calls dlopen with absolute path to the
main executable.
Bug: http://b/
28420266
Change-Id: I102e07bde454bd44c6e46075e3faeeb5092830d8
(cherry picked from commit
2ba1cf39ae6087249a839ec7b3793d4d4fa75438)
Dimitry Ivanov [Tue, 17 May 2016 22:25:48 +0000 (22:25 +0000)]
Merge "Fix dlopen of main executable by absolute path"
Dimitry Ivanov [Tue, 17 May 2016 20:29:37 +0000 (13:29 -0700)]
Fix dlopen of main executable by absolute path
This CL adds initialization of inode for the main executable
which enables linker to resolve the correct soinfo when
application calls dlopen with absolute path to the
main executable.
Bug: http://b/
28420266
Change-Id: I102e07bde454bd44c6e46075e3faeeb5092830d8
Dimitry Ivanov [Thu, 12 May 2016 22:20:21 +0000 (15:20 -0700)]
linker: Allow caller to specify parent namespace
This change enables apps to share libraries opened
with RTLD_GLOBAL between different classloader namespaces.
The new parameter to create_namespace allows native_loader
to instruct the linker to share libraries belonging to
global group from a specified namespace instead of
using the caller_ns.
Bug: http://b/
28560538
Bug: https://code.google.com/p/android/issues/detail?id=208458
Change-Id: I5d0c62730bbed19cdeb16c7559c74aa262a2475f
Android Build Merger (Role) [Tue, 17 May 2016 19:18:02 +0000 (19:18 +0000)]
Merge "Fix overflow testing in sbrk. am:
1944780b62 am:
3a5ebf3154 -s ours am:
d95336ac42 am:
0993319651 am:
0ae30d9af8 am:
83b0671a33 am:
10a48fb557 am:
fd84d78b1e am:
b4d92e1362 am:
ad80daaab5 am:
7189a4ccc2 am:
d120719e25 am:
bf4684841c" into nyc-mr1-dev-plus-aosp
Christopher Ferris [Tue, 17 May 2016 19:17:48 +0000 (19:17 +0000)]
Fix overflow testing in sbrk. am:
1944780b62 am:
3a5ebf3154 -s ours am:
d95336ac42 am:
0993319651 am:
0ae30d9af8 am:
83b0671a33 am:
10a48fb557 am:
fd84d78b1e am:
b4d92e1362 am:
ad80daaab5 am:
7189a4ccc2 am:
d120719e25
am:
bf4684841c
* commit '
bf4684841c5b6d95a6e1cb0a0830b8f4731ef3ff':
Fix overflow testing in sbrk.
Change-Id: I4eb41132761e5ae48b9347ac40864e9e126fc48f
Christopher Ferris [Tue, 17 May 2016 19:17:47 +0000 (19:17 +0000)]
Fix overflow testing in sbrk. am:
1944780b62 am:
3a5ebf3154 -s ours am:
d95336ac42 am:
0993319651 am:
0ae30d9af8 am:
83b0671a33 am:
10a48fb557 am:
fd84d78b1e am:
b4d92e1362 am:
ad80daaab5 am:
7189a4ccc2 am:
d120719e25
am:
7116b288cf
* commit '
7116b288cfac33aea41ee0a06af09bbfb07e7132':
Fix overflow testing in sbrk.
Change-Id: I54420449795a7895c3f9960140f6049a013da669
Christopher Ferris [Tue, 17 May 2016 19:15:31 +0000 (19:15 +0000)]
Fix overflow testing in sbrk. am:
1944780b62 am:
3a5ebf3154 -s ours am:
d95336ac42 am:
0993319651 am:
0ae30d9af8 am:
83b0671a33 am:
10a48fb557 am:
fd84d78b1e am:
b4d92e1362 am:
ad80daaab5 am:
7189a4ccc2
am:
d120719e25
* commit '
d120719e250d3f112b1c71ae775cab09c70191cd':
Fix overflow testing in sbrk.
Change-Id: I73f8e393da184b7f4461d26d5d22b30ad75ae641
Christopher Ferris [Tue, 17 May 2016 19:15:05 +0000 (19:15 +0000)]
Fix overflow testing in sbrk. am:
1944780b62 am:
3a5ebf3154 -s ours am:
d95336ac42 am:
0993319651 am:
0ae30d9af8 am:
83b0671a33 am:
10a48fb557 am:
fd84d78b1e am:
b4d92e1362 am:
ad80daaab5 am:
7189a4ccc2
am:
d120719e25
* commit '
d120719e250d3f112b1c71ae775cab09c70191cd':
Fix overflow testing in sbrk.
Change-Id: I4ab3da189f46d29b1e9fcd9737227e4fcf73221e
Android Build Merger (Role) [Tue, 17 May 2016 19:12:37 +0000 (19:12 +0000)]
Merge "Fix brk/sbrk error checking. am:
f36b5088a3 am:
1d358c8ed4 -s ours am:
f3a1f4244d am:
c0c1abe518 am:
b6789dc3b5 am:
d54ed72cd8 am:
02f7869aef am:
1d59a2d6c3 am:
2f78cab202 am:
b472137abf am:
0d7fdf1499 am:
74d59a0302 am:
7d3f3ba14e" into nyc-mr1-dev-plus-aosp
Elliott Hughes [Tue, 17 May 2016 19:12:25 +0000 (19:12 +0000)]
Fix brk/sbrk error checking. am:
f36b5088a3 am:
1d358c8ed4 -s ours am:
f3a1f4244d am:
c0c1abe518 am:
b6789dc3b5 am:
d54ed72cd8 am:
02f7869aef am:
1d59a2d6c3 am:
2f78cab202 am:
b472137abf am:
0d7fdf1499 am:
74d59a0302
am:
7d3f3ba14e
* commit '
7d3f3ba14e19f87028b1b5b9b5ff4342ab039215':
Fix brk/sbrk error checking.
Change-Id: I88639c16d60a0ddb0a9f3814150a316be6c0bc42
Elliott Hughes [Tue, 17 May 2016 19:12:24 +0000 (19:12 +0000)]
Fix brk/sbrk error checking. am:
f36b5088a3 am:
1d358c8ed4 -s ours am:
f3a1f4244d am:
c0c1abe518 am:
b6789dc3b5 am:
d54ed72cd8 am:
02f7869aef am:
1d59a2d6c3 am:
2f78cab202 am:
b472137abf am:
0d7fdf1499 am:
74d59a0302
am:
9e13a1bbe1
* commit '
9e13a1bbe1f2979422f6e77649976301517e3a9d':
Fix brk/sbrk error checking.
Change-Id: I518f019b10a5fb09ae7b6f6182708b67313b1e71
Christopher Ferris [Tue, 17 May 2016 19:12:23 +0000 (19:12 +0000)]
Fix overflow testing in sbrk. am:
1944780b62 am:
3a5ebf3154 -s ours am:
d95336ac42 am:
0993319651 am:
0ae30d9af8 am:
83b0671a33 am:
10a48fb557 am:
fd84d78b1e am:
b4d92e1362 am:
ad80daaab5
am:
7189a4ccc2
* commit '
7189a4ccc23598eeca0d769bc70916b6a9fe3bf6':
Fix overflow testing in sbrk.
Change-Id: I3ede782a21037ce189b093dc4448ac5154a11f1b
Elliott Hughes [Tue, 17 May 2016 19:09:55 +0000 (19:09 +0000)]
Fix brk/sbrk error checking. am:
f36b5088a3 am:
1d358c8ed4 -s ours am:
f3a1f4244d am:
c0c1abe518 am:
b6789dc3b5 am:
d54ed72cd8 am:
02f7869aef am:
1d59a2d6c3 am:
2f78cab202 am:
b472137abf am:
0d7fdf1499
am:
74d59a0302
* commit '
74d59a0302a3c3c0a83f96110e0f6949ab84ba91':
Fix brk/sbrk error checking.
Change-Id: Ie3553f759197b6584e0206c72483dd9f030ce975
Elliott Hughes [Tue, 17 May 2016 19:09:43 +0000 (19:09 +0000)]
Fix brk/sbrk error checking. am:
f36b5088a3 am:
1d358c8ed4 -s ours am:
f3a1f4244d am:
c0c1abe518 am:
b6789dc3b5 am:
d54ed72cd8 am:
02f7869aef am:
1d59a2d6c3 am:
2f78cab202 am:
b472137abf am:
0d7fdf1499
am:
74d59a0302
* commit '
74d59a0302a3c3c0a83f96110e0f6949ab84ba91':
Fix brk/sbrk error checking.
Change-Id: Ib27d423f22a9e8dcade2cd1e9d3e3b0469a47459
Elliott Hughes [Tue, 17 May 2016 19:06:53 +0000 (19:06 +0000)]
Fix brk/sbrk error checking. am:
f36b5088a3 am:
1d358c8ed4 -s ours am:
f3a1f4244d am:
c0c1abe518 am:
b6789dc3b5 am:
d54ed72cd8 am:
02f7869aef am:
1d59a2d6c3 am:
2f78cab202 am:
b472137abf
am:
0d7fdf1499
* commit '
0d7fdf149998059f4b3ac115d191ab53bf1b2f43':
Fix brk/sbrk error checking.
Change-Id: I8ef9e4a387599a330e75985f740973f941cc335f
Christopher Ferris [Tue, 17 May 2016 19:06:52 +0000 (19:06 +0000)]
Fix overflow testing in sbrk. am:
1944780b62 am:
3a5ebf3154 -s ours am:
d95336ac42 am:
0993319651 am:
0ae30d9af8 am:
83b0671a33 am:
10a48fb557 am:
fd84d78b1e am:
b4d92e1362
am:
ad80daaab5
* commit '
ad80daaab5cd1fc86ec2b61f0ed1eb8918a74a74':
Fix overflow testing in sbrk.
Change-Id: Iacf234b6d224df38dc59fde9c3c9f8a82ba1ad0a
Elliott Hughes [Tue, 17 May 2016 19:04:02 +0000 (19:04 +0000)]
Fix brk/sbrk error checking. am:
f36b5088a3 am:
1d358c8ed4 -s ours am:
f3a1f4244d am:
c0c1abe518 am:
b6789dc3b5 am:
d54ed72cd8 am:
02f7869aef am:
1d59a2d6c3 am:
2f78cab202
am:
b472137abf
* commit '
b472137abf6159bd963381befbf4516242cbea0c':
Fix brk/sbrk error checking.
Change-Id: Ibc660adf87cc5c61debd3e2e6e0ac58a4d661668
Christopher Ferris [Tue, 17 May 2016 19:03:59 +0000 (19:03 +0000)]
Fix overflow testing in sbrk. am:
1944780b62 am:
3a5ebf3154 -s ours am:
d95336ac42 am:
0993319651 am:
0ae30d9af8 am:
83b0671a33 am:
10a48fb557 am:
fd84d78b1e
am:
b4d92e1362
* commit '
b4d92e1362009637a1d0fb7ee7f96d2812a09202':
Fix overflow testing in sbrk.
Change-Id: I0e8c70deedb9f43204d306a5fdad22b14703dbe5
Elliott Hughes [Tue, 17 May 2016 19:00:49 +0000 (19:00 +0000)]
Fix brk/sbrk error checking. am:
f36b5088a3 am:
1d358c8ed4 -s ours am:
f3a1f4244d am:
c0c1abe518 am:
b6789dc3b5 am:
d54ed72cd8 am:
02f7869aef am:
1d59a2d6c3
am:
2f78cab202
* commit '
2f78cab2026db556b166386323542708a3bc6ba3':
Fix brk/sbrk error checking.
Change-Id: I20fce57c0bb3ee7fb99d2a9b10286b79c9458bd2
Christopher Ferris [Tue, 17 May 2016 19:00:48 +0000 (19:00 +0000)]
Fix overflow testing in sbrk. am:
1944780b62 am:
3a5ebf3154 -s ours am:
d95336ac42 am:
0993319651 am:
0ae30d9af8 am:
83b0671a33 am:
10a48fb557
am:
fd84d78b1e
* commit '
fd84d78b1e0840905b80a4c4072db27b5e3aa2c9':
Fix overflow testing in sbrk.
Change-Id: I8bf29354a9a631ad7c33a1eab3f66124546b7331
Elliott Hughes [Tue, 17 May 2016 18:57:30 +0000 (18:57 +0000)]
Fix brk/sbrk error checking. am:
f36b5088a3 am:
1d358c8ed4 -s ours am:
f3a1f4244d am:
c0c1abe518 am:
b6789dc3b5 am:
d54ed72cd8 am:
02f7869aef
am:
1d59a2d6c3
* commit '
1d59a2d6c3836e8f3a85062ce6725ae489c0122b':
Fix brk/sbrk error checking.
Change-Id: I3cc097839dfc3534f31c114c15bc89dedb6ba866
Christopher Ferris [Tue, 17 May 2016 18:57:23 +0000 (18:57 +0000)]
Fix overflow testing in sbrk. am:
1944780b62 am:
3a5ebf3154 -s ours am:
d95336ac42 am:
0993319651 am:
0ae30d9af8 am:
83b0671a33
am:
10a48fb557
* commit '
10a48fb5576d44326e35ee01d6163ba78faab9e4':
Fix overflow testing in sbrk.
Change-Id: Ie5de1ba25e3a769ff57bd9280ae4d4d9625fe4ee
Elliott Hughes [Tue, 17 May 2016 18:52:47 +0000 (18:52 +0000)]
Fix brk/sbrk error checking. am:
f36b5088a3 am:
1d358c8ed4 -s ours am:
f3a1f4244d am:
c0c1abe518 am:
b6789dc3b5 am:
d54ed72cd8
am:
02f7869aef
* commit '
02f7869aefb851d721c3020fca5b35c0ad9de713':
Fix brk/sbrk error checking.
Change-Id: I31322f99f91feb450792baa2781ad87873a0adc1
Christopher Ferris [Tue, 17 May 2016 18:52:47 +0000 (18:52 +0000)]
Fix overflow testing in sbrk. am:
1944780b62 am:
3a5ebf3154 -s ours am:
d95336ac42 am:
0993319651 am:
0ae30d9af8
am:
83b0671a33
* commit '
83b0671a33a0da3d0ed962f8f01ff166069093dd':
Fix overflow testing in sbrk.
Change-Id: Id325431f9de4bdfe102381da21445fa0781ccc82
Elliott Hughes [Tue, 17 May 2016 18:49:14 +0000 (18:49 +0000)]
Fix brk/sbrk error checking. am:
f36b5088a3 am:
1d358c8ed4 -s ours am:
f3a1f4244d am:
c0c1abe518 am:
b6789dc3b5
am:
d54ed72cd8
* commit '
d54ed72cd89cb66211a011e92acd645dcc0c2243':
Fix brk/sbrk error checking.
Change-Id: I630c562d6642cce13cb1697e4dfed2432323f57e
Christopher Ferris [Tue, 17 May 2016 18:49:09 +0000 (18:49 +0000)]
Fix overflow testing in sbrk. am:
1944780b62 am:
3a5ebf3154 -s ours am:
d95336ac42 am:
0993319651
am:
0ae30d9af8
* commit '
0ae30d9af8c55d95edf7ddb1c2cb4f9dc0579f83':
Fix overflow testing in sbrk.
Change-Id: I2d63124f58990f8ae3db35789bdd993d98d389ab
Elliott Hughes [Tue, 17 May 2016 18:44:48 +0000 (18:44 +0000)]
Fix brk/sbrk error checking. am:
f36b5088a3 am:
1d358c8ed4 -s ours am:
f3a1f4244d am:
c0c1abe518
am:
b6789dc3b5
* commit '
b6789dc3b5fbf8bbd6b407ffe53668138e828655':
Fix brk/sbrk error checking.
Change-Id: Ief90c1e5bac313ff5a2d18117e70b67e62ced301
Christopher Ferris [Tue, 17 May 2016 18:44:48 +0000 (18:44 +0000)]
Fix overflow testing in sbrk. am:
1944780b62 am:
3a5ebf3154 -s ours am:
d95336ac42
am:
0993319651
* commit '
099331965176b368af627858f087dc0eccd0fc18':
Fix overflow testing in sbrk.
Change-Id: I4bb6ccba7238bb786eee22cb96b0bc64c3f534b8
Christopher Ferris [Tue, 17 May 2016 18:41:21 +0000 (18:41 +0000)]
Fix overflow testing in sbrk. am:
1944780b62 am:
3a5ebf3154 -s ours
am:
d95336ac42
* commit '
d95336ac42e910e9dd11f01f5af65e8e1f4505cb':
Fix overflow testing in sbrk.
Change-Id: I60e5637cf560af8b95ccc585f86c2f0fa04481f1
Elliott Hughes [Tue, 17 May 2016 18:41:19 +0000 (18:41 +0000)]
Fix brk/sbrk error checking. am:
f36b5088a3 am:
1d358c8ed4 -s ours am:
f3a1f4244d
am:
c0c1abe518
* commit '
c0c1abe518ae6a7470aaf50f2170c588eca0c69a':
Fix brk/sbrk error checking.
Change-Id: I8e622e884c0fe5c7262bae9d42971c30f9b2e4a2
Christopher Ferris [Tue, 17 May 2016 18:37:25 +0000 (18:37 +0000)]
Fix overflow testing in sbrk. am:
1944780b62
am:
3a5ebf3154 -s ours
* commit '
3a5ebf3154f4ff22b9196f0cc43986a458b6cadc':
Fix overflow testing in sbrk.
Change-Id: I48cdfd2a6d05fa81bcd3dc3415c078b5f79c1f0f
Elliott Hughes [Tue, 17 May 2016 18:37:10 +0000 (18:37 +0000)]
Fix brk/sbrk error checking. am:
f36b5088a3 am:
1d358c8ed4 -s ours
am:
f3a1f4244d
* commit '
f3a1f4244dd53aa9ff5f3c13578c52d3f74aae86':
Fix brk/sbrk error checking.
Change-Id: Iedd0f7a24a709b4ee7e9b39fd293d56d71d7ec6f
Elliott Hughes [Tue, 17 May 2016 18:34:36 +0000 (18:34 +0000)]
Fix brk/sbrk error checking. am:
f36b5088a3
am:
1d358c8ed4 -s ours
* commit '
1d358c8ed4443d358f8a6141071c2445b52c8077':
Fix brk/sbrk error checking.
Change-Id: I8514cee9e52d38fe8aa92310d9566e8041c58efb
Christopher Ferris [Tue, 17 May 2016 18:20:00 +0000 (18:20 +0000)]
Fix overflow testing in sbrk.
am:
1944780b62
* commit '
1944780b62f84acb660f46c8ae37e10928de8dab':
Fix overflow testing in sbrk.
Change-Id: I25d6ec44731e53b098b3d6a70ae7eb37e5821ed1
Elliott Hughes [Tue, 17 May 2016 18:19:59 +0000 (18:19 +0000)]
Fix brk/sbrk error checking.
am:
f36b5088a3
* commit '
f36b5088a32775c44661fb6b348ed0b6b3b67e65':
Fix brk/sbrk error checking.
Change-Id: Ie98e3cd7f1f742a22f0f3f0bd1182e95c55a4280
Elliott Hughes [Tue, 17 May 2016 03:20:28 +0000 (03:20 +0000)]
Merge "Regenerate NOTICE files." am:
5df5884743 am:
4923294fc2
am:
f81e0979b0
* commit '
f81e0979b06660d678bd5ff24ce1ebf42aacba72':
Regenerate NOTICE files.
Change-Id: Ifa1937cf553ca40967e8455c9894675323c9d270
Elliott Hughes [Tue, 17 May 2016 03:18:11 +0000 (03:18 +0000)]
Merge "Regenerate NOTICE files." am:
5df5884743
am:
4923294fc2
* commit '
4923294fc267fb11849cf093089688565d8348c0':
Regenerate NOTICE files.
Change-Id: Ibe15057d2a512ef1dabe448e8ab9fadabbe5063e
Elliott Hughes [Tue, 17 May 2016 03:15:34 +0000 (03:15 +0000)]
Merge "Regenerate NOTICE files."
am:
5df5884743
* commit '
5df5884743306f7b2ee437c293f4197101528a98':
Regenerate NOTICE files.
Change-Id: I1246395d232dd6add3446301d5855971b004d770
Elliott Hughes [Tue, 17 May 2016 03:15:31 +0000 (03:15 +0000)]
Merge "Stop including <machine/cpu-features.h>." am:
ecffdeb0e2 am:
b749fcbbb1
am:
28f899605b
* commit '
28f899605bf7358aae7bf39225f1ad398b2e7132':
Stop including <machine/cpu-features.h>.
Change-Id: I42eb3ae510e837f1c54b556b41845f47069ba970
Elliott Hughes [Tue, 17 May 2016 03:13:11 +0000 (03:13 +0000)]
Merge "Stop including <machine/cpu-features.h>." am:
ecffdeb0e2
am:
b749fcbbb1
* commit '
b749fcbbb16e36fc87a3132e2975d3d8353af64d':
Stop including <machine/cpu-features.h>.
Change-Id: I2a172badcffe9a4c156d574dea84d8ffc8203c98
Elliott Hughes [Tue, 17 May 2016 03:10:46 +0000 (03:10 +0000)]
Merge "Stop including <machine/cpu-features.h>."
am:
ecffdeb0e2
* commit '
ecffdeb0e21d08d51f0b75f115ee2a44221f663e':
Stop including <machine/cpu-features.h>.
Change-Id: I0e9b85f456e47aab3209b37c50b214d4a1e2a742
Elliott Hughes [Tue, 17 May 2016 03:10:29 +0000 (03:10 +0000)]
Merge "Regenerate NOTICE files."
Elliott Hughes [Tue, 17 May 2016 03:06:48 +0000 (03:06 +0000)]
Merge "Stop including <machine/cpu-features.h>."
Elliott Hughes [Tue, 17 May 2016 00:52:40 +0000 (17:52 -0700)]
Stop including <machine/cpu-features.h>.
We're not looking at __ARM_ARCH__, because we don't support ARMv6.
Bug: http://b/
18556103
Change-Id: I91fe096af697dc842a57e97515312e3530743678
Colin Cross [Tue, 17 May 2016 00:52:31 +0000 (00:52 +0000)]
Merge "Use Android.soong.mk to handle mixed Android.mk and Android.bp dirs" am:
79d0281456 am:
f8e8b02145
am:
aea5ce13d7
* commit '
aea5ce13d740381274eb84ebf406b094d6759873':
Use Android.soong.mk to handle mixed Android.mk and Android.bp dirs
Change-Id: Ic879660b9d1bd76e7a4c18fa5c5784cc378ea3ca
Colin Cross [Tue, 17 May 2016 00:49:57 +0000 (00:49 +0000)]
Merge "Use Android.soong.mk to handle mixed Android.mk and Android.bp dirs" am:
79d0281456
am:
f8e8b02145
* commit '
f8e8b02145766e61aa6528162cf68ea436d5c2e7':
Use Android.soong.mk to handle mixed Android.mk and Android.bp dirs
Change-Id: I1bc00f9b3ed50ae660e2143bc94bbfd7881f7074
Colin Cross [Tue, 17 May 2016 00:47:13 +0000 (00:47 +0000)]
Merge "Use Android.soong.mk to handle mixed Android.mk and Android.bp dirs"
am:
79d0281456
* commit '
79d028145670a3b3d5a0e7efc3178bc685f77b66':
Use Android.soong.mk to handle mixed Android.mk and Android.bp dirs
Change-Id: I4e618f175303fe9a6ed33e77e7d394fff8813606
Elliott Hughes [Tue, 17 May 2016 00:35:36 +0000 (17:35 -0700)]
Regenerate NOTICE files.
Also clean up some near-miss copyright headers in libm, and remove
some cruft in <grp.h>/<pwd.h> that the script can't automatically
ignore since we stripped all the tabs in those files.
Change-Id: I10796c54dda1ceba87822ae0de26b5d71b54972b
Colin Cross [Tue, 17 May 2016 00:42:17 +0000 (00:42 +0000)]
Merge "Use Android.soong.mk to handle mixed Android.mk and Android.bp dirs"
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."
Colin Cross [Mon, 16 May 2016 23:55:08 +0000 (16:55 -0700)]
Use Android.soong.mk to handle mixed Android.mk and Android.bp dirs
When building with soong Android.mk files are ignored in directories
that have Android.bp files. Only parts of bionic have been converted to
Android.bp files, including some directories that have subdirectories
with Android.mk files.
Add Android.soong.mk files to include subdirectories to any directory
that has an Android.bp file but also has subdirectories with only
Android.mk files.
Change-Id: Ibd3c27d51c44f7a4b42dad0bc747e357b4ae34ca
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: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