OSDN Git Service
Sami Tolvanen [Mon, 5 Oct 2015 09:12:55 +0000 (09:12 +0000)]
am
0cb579b3: am
6ddfa666: am
92e11ea1: Merge "Add NOTICE files"
* commit '
0cb579b362087bc8ce200acb1ae178d7a40ae442':
Add NOTICE files
Sami Tolvanen [Mon, 5 Oct 2015 09:08:16 +0000 (09:08 +0000)]
am
6ddfa666: am
92e11ea1: Merge "Add NOTICE files"
* commit '
6ddfa666333f43f2f2961ceb3774440143f1ee98':
Add NOTICE files
Sami Tolvanen [Mon, 5 Oct 2015 09:03:48 +0000 (09:03 +0000)]
am
92e11ea1: Merge "Add NOTICE files"
* commit '
92e11ea1b900fc89cf98604a9e2ebb5c7d570a01':
Add NOTICE files
Sami Tolvanen [Mon, 5 Oct 2015 08:04:54 +0000 (08:04 +0000)]
Merge "Add NOTICE files"
Adam Langley [Sat, 3 Oct 2015 00:32:23 +0000 (00:32 +0000)]
am
35ee1587: am
241ffafa: Prepare for BoringSSL update.
* commit '
35ee1587b2882fb712956b34d44e81486578fbca':
Prepare for BoringSSL update.
Adam Langley [Sat, 3 Oct 2015 00:28:03 +0000 (00:28 +0000)]
am
241ffafa: Prepare for BoringSSL update.
* commit '
241ffafa8ef52a503e7aaee31ead8c898c1b4126':
Prepare for BoringSSL update.
Adam Langley [Wed, 2 Sep 2015 22:45:12 +0000 (15:45 -0700)]
Prepare for BoringSSL update.
This change tweaks things as needed so that the code will compile
against both the BoringSSL that's currently in Android and a version
from upstream. The BORINGSSL_201509 define is temporary to allow the
switch to happen without breaking the build and a followup change will
remove it.
In this case, we backed off on removing |ERR_print_errors|, despite it
being a wart in the layering of the code.
(cherry picked from commit
7a688f6e8774920cb8cfc52bf2e3c16976e8ff23)
Change-Id: I2f2f567cfc37fe2d5a69742302c5a92d289b814f
Sami Tolvanen [Fri, 2 Oct 2015 08:18:08 +0000 (09:18 +0100)]
Add NOTICE files
Bug:
24571219
Change-Id: Ib7a4374974c2d0d9225caa1e43d0b78251a36bd2
Yabin Cui [Thu, 1 Oct 2015 19:41:04 +0000 (19:41 +0000)]
am
8db95c96: am
8f9dfc5e: am
eac5440e: Merge "Simpleperf: warn if it can\'t read kernel symbols addresses."
* commit '
8db95c9669927dfda951c6d7a3713bdefb59204c':
Simpleperf: warn if it can't read kernel symbols addresses.
Yabin Cui [Thu, 1 Oct 2015 19:09:41 +0000 (19:09 +0000)]
am
8f9dfc5e: am
eac5440e: Merge "Simpleperf: warn if it can\'t read kernel symbols addresses."
* commit '
8f9dfc5e5af5c833e78d8caff2cd538ee6807aad':
Simpleperf: warn if it can't read kernel symbols addresses.
Yabin Cui [Thu, 1 Oct 2015 19:02:28 +0000 (19:02 +0000)]
am
eac5440e: Merge "Simpleperf: warn if it can\'t read kernel symbols addresses."
* commit '
eac5440e1fcff3ba0b5ed0779f962e9405918e06':
Simpleperf: warn if it can't read kernel symbols addresses.
Yabin Cui [Thu, 1 Oct 2015 18:55:38 +0000 (18:55 +0000)]
Merge "Simpleperf: warn if it can't read kernel symbols addresses."
Yabin Cui [Thu, 1 Oct 2015 18:32:44 +0000 (11:32 -0700)]
Simpleperf: warn if it can't read kernel symbols addresses.
And a little format adjustment.
Bug:
24404256
Change-Id: Ie8dcd37138a693df18101d415e6e3243f4963582
Sami Tolvanen [Tue, 29 Sep 2015 13:23:21 +0000 (13:23 +0000)]
am
4d2a0a27: am
66059d6a: am
482fe9e3: Merge "fec: enable building on Mac"
* commit '
4d2a0a277b5f97619947ba397ada7663ee11a46b':
fec: enable building on Mac
Sami Tolvanen [Tue, 29 Sep 2015 13:17:50 +0000 (13:17 +0000)]
am
66059d6a: am
482fe9e3: Merge "fec: enable building on Mac"
* commit '
66059d6acd45ad1e674db44f5bd90fc36d5f87e9':
fec: enable building on Mac
Sami Tolvanen [Tue, 29 Sep 2015 13:12:20 +0000 (13:12 +0000)]
am
482fe9e3: Merge "fec: enable building on Mac"
* commit '
482fe9e37737e5d6c7d0a4e0fe303e7d097971aa':
fec: enable building on Mac
Sami Tolvanen [Tue, 29 Sep 2015 13:07:46 +0000 (13:07 +0000)]
Merge "fec: enable building on Mac"
Sami Tolvanen [Mon, 28 Sep 2015 16:05:11 +0000 (17:05 +0100)]
fec: enable building on Mac
Enable the host libfec and the fec tool to be built on Mac with the
help of <utils/Compat.h>.
Change-Id: I5e7c9fac11f4a00814bad92734e703ec8dc22dc9
Sami Tolvanen [Mon, 28 Sep 2015 16:33:08 +0000 (16:33 +0000)]
am
d0c62703: am
180e08a7: am
3625af96: Merge "Error correction: Add a tool for en/decoding files"
* commit '
d0c62703faea990cbc71bbc92617dcc725cbe37e':
Error correction: Add a tool for en/decoding files
Sami Tolvanen [Mon, 28 Sep 2015 16:27:52 +0000 (16:27 +0000)]
am
180e08a7: am
3625af96: Merge "Error correction: Add a tool for en/decoding files"
* commit '
180e08a70c546a2e72914ec329f7e989975e5811':
Error correction: Add a tool for en/decoding files
Sami Tolvanen [Mon, 28 Sep 2015 16:19:36 +0000 (16:19 +0000)]
am
3625af96: Merge "Error correction: Add a tool for en/decoding files"
* commit '
3625af964efa97cc7163f88ff711e67fab57af23':
Error correction: Add a tool for en/decoding files
Sami Tolvanen [Mon, 28 Sep 2015 16:14:25 +0000 (16:14 +0000)]
Merge "Error correction: Add a tool for en/decoding files"
Sami Tolvanen [Mon, 28 Sep 2015 15:28:25 +0000 (15:28 +0000)]
am
2484d97b: am
92dc275d: am
c82ca9f7: Merge "libfec: fix Mac build"
* commit '
2484d97b1bfc1655341cec320bb0a9117e53f918':
libfec: fix Mac build
Sami Tolvanen [Mon, 28 Sep 2015 15:20:39 +0000 (15:20 +0000)]
am
92dc275d: am
c82ca9f7: Merge "libfec: fix Mac build"
* commit '
92dc275de044b123a277255ce8af4a0756298712':
libfec: fix Mac build
Sami Tolvanen [Mon, 28 Sep 2015 15:14:14 +0000 (15:14 +0000)]
am
c82ca9f7: Merge "libfec: fix Mac build"
* commit '
c82ca9f7c85aa86ce0e1c758e4abddae1e201a15':
libfec: fix Mac build
Sami Tolvanen [Mon, 28 Sep 2015 15:10:14 +0000 (15:10 +0000)]
Merge "libfec: fix Mac build"
Sami Tolvanen [Mon, 28 Sep 2015 14:54:42 +0000 (15:54 +0100)]
libfec: fix Mac build
Exclude the host library and executables on Mac.
Change-Id: Ie399b83f3678d16aac67ce9a4414344a93f90055
Sami Tolvanen [Mon, 28 Sep 2015 14:30:07 +0000 (14:30 +0000)]
am
bdb9e4c7: am
3980c7fd: am
13f25b1b: Merge "Error correction: Add libfec to read encoded data"
* commit '
bdb9e4c7f2e230cda2a0f4cd3ca78b8b527d84d2':
Error correction: Add libfec to read encoded data
Sami Tolvanen [Mon, 28 Sep 2015 14:22:58 +0000 (14:22 +0000)]
am
3980c7fd: am
13f25b1b: Merge "Error correction: Add libfec to read encoded data"
* commit '
3980c7fddac570383c02f8e825cc6c1d50eb2992':
Error correction: Add libfec to read encoded data
Sami Tolvanen [Mon, 28 Sep 2015 14:15:57 +0000 (14:15 +0000)]
am
13f25b1b: Merge "Error correction: Add libfec to read encoded data"
* commit '
13f25b1b7f337802d3d1ad9d4e57f25737a18045':
Error correction: Add libfec to read encoded data
Sami Tolvanen [Mon, 28 Sep 2015 14:09:01 +0000 (14:09 +0000)]
Merge "Error correction: Add libfec to read encoded data"
Yabin Cui [Fri, 25 Sep 2015 19:00:27 +0000 (19:00 +0000)]
am
c5ae05fd: am
b72a2e89: am
af995fea: Merge "Simpleperf: support dwarf callgraph in report command."
* commit '
c5ae05fd456b5dc0a82ee9e6cd20c558fd930e41':
Simpleperf: support dwarf callgraph in report command.
Yabin Cui [Fri, 25 Sep 2015 18:31:58 +0000 (18:31 +0000)]
am
b72a2e89: am
af995fea: Merge "Simpleperf: support dwarf callgraph in report command."
* commit '
b72a2e89aaf102b20a9324f2d1f5d24078ade6fd':
Simpleperf: support dwarf callgraph in report command.
Yabin Cui [Fri, 25 Sep 2015 18:22:38 +0000 (18:22 +0000)]
am
af995fea: Merge "Simpleperf: support dwarf callgraph in report command."
* commit '
af995fea111f29215c6a46099f741ebd4566fd5d':
Simpleperf: support dwarf callgraph in report command.
Yabin Cui [Fri, 25 Sep 2015 18:16:11 +0000 (18:16 +0000)]
Merge "Simpleperf: support dwarf callgraph in report command."
Sami Tolvanen [Sat, 16 May 2015 14:14:14 +0000 (15:14 +0100)]
Error correction: Add a tool for en/decoding files
Add fec, a tool for generating error-correcting codes for files
and recovering them.
Bug:
21893453
Change-Id: I389c92e5cc7f825d632759b9f96045767e74120a
Sami Tolvanen [Fri, 26 Jun 2015 13:28:31 +0000 (14:28 +0100)]
Error correction: Add libfec to read encoded data
Add libfec to read files or partitions with error-correcting codes
appended to them. Uses verity metadata to speed up I/O and improve
error correction effectiveness.
Bug:
21893453
Change-Id: I94b95058b084418019fc96595bb6055df36e2c2b
Yabin Cui [Thu, 24 Sep 2015 22:22:50 +0000 (22:22 +0000)]
am
031f9699: am
edae80e0: am
a3e9a836: Merge "Simpleperf: fix flaky workload unit tests."
* commit '
031f9699d0c9fff85fd294026e52e88e7613378f':
Simpleperf: fix flaky workload unit tests.
Yabin Cui [Thu, 24 Sep 2015 22:12:55 +0000 (22:12 +0000)]
am
edae80e0: am
a3e9a836: Merge "Simpleperf: fix flaky workload unit tests."
* commit '
edae80e066445ee0b370f32a965d6a5d6dcfafee':
Simpleperf: fix flaky workload unit tests.
Yabin Cui [Thu, 24 Sep 2015 22:05:10 +0000 (22:05 +0000)]
am
a3e9a836: Merge "Simpleperf: fix flaky workload unit tests."
* commit '
a3e9a836bf0d21dc5248622f16c60d8617f54080':
Simpleperf: fix flaky workload unit tests.
Yabin Cui [Thu, 24 Sep 2015 21:59:16 +0000 (21:59 +0000)]
Merge "Simpleperf: fix flaky workload unit tests."
Ying Wang [Thu, 24 Sep 2015 21:19:02 +0000 (21:19 +0000)]
am
98e143f5: am
7733e126: am
c137c2ba: Merge "Fix multilib build warning."
* commit '
98e143f5c9338290ef5df65f53786b0c235403c2':
Fix multilib build warning.
Yabin Cui [Thu, 24 Sep 2015 19:37:27 +0000 (12:37 -0700)]
Simpleperf: fix flaky workload unit tests.
Move SIGABRT to SIGKILL to make sure the child process is terminated by a signal.
SIGABRT can't guarantee this because the child process can install signal handler for SIGABRT.
Add a final _exit(1) after ChildProcessFn in case execvp() fails.
Change-Id: I353720b10c6ea42826efcafce5ff2699fd246e22
Ying Wang [Thu, 24 Sep 2015 19:56:01 +0000 (19:56 +0000)]
am
7733e126: am
c137c2ba: Merge "Fix multilib build warning."
* commit '
7733e12673cd43dc101269d6159174722109c15f':
Fix multilib build warning.
Ying Wang [Thu, 24 Sep 2015 19:49:55 +0000 (19:49 +0000)]
am
c137c2ba: Merge "Fix multilib build warning."
* commit '
c137c2ba3a01c453c75fc0f635aba436cbf25581':
Fix multilib build warning.
Ying Wang [Thu, 24 Sep 2015 19:42:41 +0000 (19:42 +0000)]
Merge "Fix multilib build warning."
Ying Wang [Thu, 24 Sep 2015 19:31:50 +0000 (12:31 -0700)]
Fix multilib build warning.
Change-Id: I3816f7f5352f204795f45d782b8ec80493d78491
David Zeuthen [Thu, 24 Sep 2015 17:27:42 +0000 (17:27 +0000)]
am
2a2e469d: am
cf9e6ba7: am
133143c5: Merge "boot_control_copy: Fix getCurrentSlot()."
* commit '
2a2e469db74776ae11f68405580a6a575decc8c3':
boot_control_copy: Fix getCurrentSlot().
David Zeuthen [Thu, 24 Sep 2015 17:19:25 +0000 (17:19 +0000)]
am
cf9e6ba7: am
133143c5: Merge "boot_control_copy: Fix getCurrentSlot()."
* commit '
cf9e6ba7a443c765e23dd5301968995046629308':
boot_control_copy: Fix getCurrentSlot().
David Zeuthen [Thu, 24 Sep 2015 17:06:48 +0000 (17:06 +0000)]
am
133143c5: Merge "boot_control_copy: Fix getCurrentSlot()."
* commit '
133143c56f336eef6545ef99f4c874dba6637ea6':
boot_control_copy: Fix getCurrentSlot().
David Zeuthen [Thu, 24 Sep 2015 16:25:32 +0000 (16:25 +0000)]
Merge "boot_control_copy: Fix getCurrentSlot()."
Lorenzo Colitti [Thu, 24 Sep 2015 04:59:06 +0000 (04:59 +0000)]
am
989da8a0: am
ddd28f58: am
8ed1c510: Merge "Add test to exercise the tcp_nuke_addr functionality"
* commit '
989da8a05a6deab3ab32334267afb4d50be616f1':
Add test to exercise the tcp_nuke_addr functionality
Lorenzo Colitti [Thu, 24 Sep 2015 04:53:52 +0000 (04:53 +0000)]
am
ddd28f58: am
8ed1c510: Merge "Add test to exercise the tcp_nuke_addr functionality"
* commit '
ddd28f5859566fa96f0195ae8244a3bf5d45676a':
Add test to exercise the tcp_nuke_addr functionality
Lorenzo Colitti [Thu, 24 Sep 2015 04:47:16 +0000 (04:47 +0000)]
am
8ed1c510: Merge "Add test to exercise the tcp_nuke_addr functionality"
* commit '
8ed1c5101b2081784dcece041cf47f765896ef58':
Add test to exercise the tcp_nuke_addr functionality
Lorenzo Colitti [Thu, 24 Sep 2015 04:39:16 +0000 (04:39 +0000)]
Merge "Add test to exercise the tcp_nuke_addr functionality"
Lorenzo Colitti [Thu, 24 Sep 2015 04:18:11 +0000 (04:18 +0000)]
am
31302c28: am
b8b3dfa0: am
95aef404: Merge "Add a crash test for tcp_nuke_addr."
* commit '
31302c2801496aa63ee938c8c791917c047a674c':
Add a crash test for tcp_nuke_addr.
Lorenzo Colitti [Thu, 24 Sep 2015 04:11:09 +0000 (04:11 +0000)]
am
b8b3dfa0: am
95aef404: Merge "Add a crash test for tcp_nuke_addr."
* commit '
b8b3dfa07b6295e477e9187c9b345cf29c31f84b':
Add a crash test for tcp_nuke_addr.
Lorenzo Colitti [Thu, 24 Sep 2015 04:02:49 +0000 (04:02 +0000)]
am
95aef404: Merge "Add a crash test for tcp_nuke_addr."
* commit '
95aef404646b03e3b36a7afc8932ffdc8b8b5ba1':
Add a crash test for tcp_nuke_addr.
Lorenzo Colitti [Thu, 24 Sep 2015 03:58:37 +0000 (03:58 +0000)]
Merge "Add a crash test for tcp_nuke_addr."
Yabin Cui [Fri, 14 Aug 2015 03:30:20 +0000 (20:30 -0700)]
Simpleperf: support dwarf callgraph in report command.
Use libbacktrace for stack unwinding.
Bug:
22229391
Change-Id: Iab35cdb52936c65c4728e23423ded83050f1db76
Elliott Hughes [Wed, 23 Sep 2015 19:52:47 +0000 (19:52 +0000)]
am
5bfbc9f8: am
c96ca0e0: am
260e7e2c: Merge "Remove the hack for including libpagemap\'s headers."
* commit '
5bfbc9f863cea3290407b045f948ae133b8ab8d1':
Remove the hack for including libpagemap's headers.
Elliott Hughes [Wed, 23 Sep 2015 19:04:16 +0000 (19:04 +0000)]
am
c96ca0e0: am
260e7e2c: Merge "Remove the hack for including libpagemap\'s headers."
* commit '
c96ca0e003ee869eceadb26d18f7c96faf3a005c':
Remove the hack for including libpagemap's headers.
Elliott Hughes [Wed, 23 Sep 2015 18:56:20 +0000 (18:56 +0000)]
am
260e7e2c: Merge "Remove the hack for including libpagemap\'s headers."
* commit '
260e7e2c07b1738581c7f0620be6e674ec1a66d1':
Remove the hack for including libpagemap's headers.
Elliott Hughes [Wed, 23 Sep 2015 18:48:51 +0000 (18:48 +0000)]
Merge "Remove the hack for including libpagemap's headers."
David Zeuthen [Wed, 23 Sep 2015 18:07:10 +0000 (14:07 -0400)]
boot_control_copy: Fix getCurrentSlot().
The getCurrentSlot() method wasn't returning the right value if
setActiveBootSlot() was called with another slot since last reboot.
Instead of peeking in the misc partition, just look at the dev_t for
/system and compare it with the dev_t for system_a and system_b.
Bug:
24201805
Change-Id: I601ab5e355e0f423637e6867d0afda97f68b57fd
Elliott Hughes [Wed, 23 Sep 2015 05:48:05 +0000 (05:48 +0000)]
am
a2611e67: am
19901356: am
34cee2b8: Merge "Use %n to parse maps in libpagemap."
* commit '
a2611e676919967de19cd6eaa3e812a70f6be77d':
Use %n to parse maps in libpagemap.
Elliott Hughes [Wed, 23 Sep 2015 05:42:47 +0000 (05:42 +0000)]
am
19901356: am
34cee2b8: Merge "Use %n to parse maps in libpagemap."
* commit '
199013563172b3c1d1ef24a53285f1c6306edc84':
Use %n to parse maps in libpagemap.
Elliott Hughes [Wed, 23 Sep 2015 05:34:19 +0000 (05:34 +0000)]
am
34cee2b8: Merge "Use %n to parse maps in libpagemap."
* commit '
34cee2b8a68c6df87b1abe4f2ef7957dc717044d':
Use %n to parse maps in libpagemap.
Elliott Hughes [Wed, 23 Sep 2015 05:33:10 +0000 (22:33 -0700)]
Remove the hack for including libpagemap's headers.
Change-Id: If75e007111f82178e372c88ab4dce62fd8ff7873
Elliott Hughes [Wed, 23 Sep 2015 05:27:36 +0000 (05:27 +0000)]
Merge "Use %n to parse maps in libpagemap."
Elliott Hughes [Wed, 23 Sep 2015 01:28:04 +0000 (18:28 -0700)]
Use %n to parse maps in libpagemap.
Bug: http://b/
24212024
Change-Id: If00782c7af6fde30650045180512132ee5a8fd89
Alex Deymo [Tue, 22 Sep 2015 01:55:10 +0000 (01:55 +0000)]
am
7f26062e: am
c53f69cc: am
2f9d35a8: Merge "Example /postinst script module for update_engine."
* commit '
7f26062e332c850f2de700b837a59e2724a9da29':
Example /postinst script module for update_engine.
Alex Deymo [Tue, 22 Sep 2015 01:48:58 +0000 (01:48 +0000)]
am
c53f69cc: am
2f9d35a8: Merge "Example /postinst script module for update_engine."
* commit '
c53f69cce2f68196ccd86aa03af20cb13f8ff9df':
Example /postinst script module for update_engine.
Alex Deymo [Tue, 22 Sep 2015 01:41:04 +0000 (01:41 +0000)]
am
2f9d35a8: Merge "Example /postinst script module for update_engine."
* commit '
2f9d35a840e554bbbbe7b51848e78d827e62b8d1':
Example /postinst script module for update_engine.
Alex Deymo [Tue, 22 Sep 2015 01:32:55 +0000 (01:32 +0000)]
Merge "Example /postinst script module for update_engine."
Alex Deymo [Mon, 21 Sep 2015 23:49:23 +0000 (16:49 -0700)]
Example /postinst script module for update_engine.
The "post-install" program (normally /system/postinst) is a program
stored in the new system but executed from the old system right before
finishing the update. This post-install step provides a way to perform
device-specific tasks needed for old devices to accept the new update
*before* attempting to boot it.
Currently, we don't require any particular task to be performed in this
step, so this is just an example post-install program with some
documentation. Nevertheless, update_engine payload major version 1
requires a /postinst script in the system partition. While we plan to
use payload major version 2 in Brillo, this patch allows to push images
to the pre-release version of update_engine.
Bug:
24194445
Test: `m` includes /postinst in a Brillo target.
Change-Id: I6397537119873c68e0a626a37137ececcf8f03d5
Tom Cherry [Mon, 21 Sep 2015 21:41:49 +0000 (21:41 +0000)]
am
15c7b0c1: add system-background cpuset
* commit '
15c7b0c16d7cffa0ebba56c4d9c096b8e890f58b':
add system-background cpuset
Tom Cherry [Mon, 21 Sep 2015 21:26:22 +0000 (14:26 -0700)]
add system-background cpuset
add a new cpuset for system services that should not run on
larger cores
bug
24144797
Change-Id: Id6932445bd340481830c2e912f1dff067d5ef4a9
Yabin Cui [Mon, 21 Sep 2015 20:00:48 +0000 (20:00 +0000)]
am
c309e184: am
19c8d5f5: resolved conflicts for
6239958b to stage-aosp-master
* commit '
c309e18409948eaf2162e328d48701b904c5c174':
Simpleperf: rewrite unsupported logging style.
Yabin Cui [Mon, 21 Sep 2015 19:45:35 +0000 (19:45 +0000)]
am
19c8d5f5: resolved conflicts for
6239958b to stage-aosp-master
* commit '
19c8d5f55b1ff4f6953eb53019d148adab0459a5':
Simpleperf: rewrite unsupported logging style.
Yabin Cui [Mon, 21 Sep 2015 19:28:46 +0000 (12:28 -0700)]
resolved conflicts for
6239958b to stage-aosp-master
Change-Id: I66d12e9a15b5e6aecd4938b9ce4ac76a0f3863e4
Yabin Cui [Mon, 21 Sep 2015 19:06:56 +0000 (19:06 +0000)]
Merge "Simpleperf: rewrite unsupported logging style."
Yabin Cui [Fri, 18 Sep 2015 18:10:55 +0000 (11:10 -0700)]
Simpleperf: rewrite unsupported logging style.
Previously we can use a ternary operator to choose the log level, like
(error ? LOG(ERROR) : LOG(DEBUG)) << xxx. But as the LOG() macro is about
to change, we can no longer write like this.
This CL also changes some improper log levels and log messages.
Change-Id: Ib9a55f2ca241516a6e89afad4a733cc07b19570f
Mark Salyzyn [Sat, 19 Sep 2015 20:07:32 +0000 (20:07 +0000)]
am
54bc0b62: am
a228293f: am
6b355fea: Merge "Build Breakage in branch: git_master @
2265859"
* commit '
54bc0b621b68644df2323e3b2ba147945371434f':
Build Breakage in branch: git_master @
2265859
Mark Salyzyn [Sat, 19 Sep 2015 19:59:56 +0000 (19:59 +0000)]
am
a228293f: am
6b355fea: Merge "Build Breakage in branch: git_master @
2265859"
* commit '
a228293f231c513a8690b033ad3c68c7213bc2d0':
Build Breakage in branch: git_master @
2265859
Mark Salyzyn [Sat, 19 Sep 2015 19:52:21 +0000 (19:52 +0000)]
am
6b355fea: Merge "Build Breakage in branch: git_master @
2265859"
* commit '
6b355feae3fe04847f9ea267649eca366b6cf85c':
Build Breakage in branch: git_master @
2265859
Mark Salyzyn [Fri, 18 Sep 2015 21:14:13 +0000 (14:14 -0700)]
Build Breakage in branch: git_master @
2265859
Split mmap-perf into a 32 and 64-bit version.
(cherry picked from commit
03def1b807fd15bd057a437bd451fb659403907f)
Change-Id: I0b69fa9b88ee571186a2c69c56b7ef46c145370a
Filipe Brandenburger [Fri, 18 Sep 2015 22:37:03 +0000 (15:37 -0700)]
Add test to exercise the tcp_nuke_addr functionality
Change-Id: I5da6a2ae4638a8405c46a03911d1257ca58cc072
Mark Salyzyn [Fri, 18 Sep 2015 21:17:05 +0000 (21:17 +0000)]
Merge "Build Breakage in branch: git_master @
2265859"
Mark Salyzyn [Fri, 18 Sep 2015 21:14:13 +0000 (14:14 -0700)]
Build Breakage in branch: git_master @
2265859
Split mmap-perf into a 32 and 64-bit version.
Change-Id: I8630d8b62f163990d0f14f3ca48bf9b72df87d45
Mark Salyzyn [Fri, 18 Sep 2015 20:42:06 +0000 (20:42 +0000)]
am
2dbea56b: am
af5b75c4: am
50e8ee7d: Merge "Yet another disk performance benchmark."
* commit '
2dbea56b717d18242bacd546ea9174cca9951f20':
Yet another disk performance benchmark.
Mark Salyzyn [Fri, 18 Sep 2015 20:32:18 +0000 (20:32 +0000)]
am
af5b75c4: am
50e8ee7d: Merge "Yet another disk performance benchmark."
* commit '
af5b75c4f73715aed27aa94393175bfb00f21a56':
Yet another disk performance benchmark.
Mark Salyzyn [Fri, 18 Sep 2015 20:23:20 +0000 (20:23 +0000)]
am
50e8ee7d: Merge "Yet another disk performance benchmark."
* commit '
50e8ee7d325260a03f5bf31050db6c04cdea589c':
Yet another disk performance benchmark.
Mark Salyzyn [Fri, 18 Sep 2015 20:17:24 +0000 (20:17 +0000)]
Merge "Yet another disk performance benchmark."
Riley Andrews [Fri, 4 Sep 2015 00:25:14 +0000 (17:25 -0700)]
Yet another disk performance benchmark.
This does memory mapped i/o on huge files, and thus requires
a 64 bit device.
Change-Id: Id91dd59b8c32751b6cb14f166affbd57912f8d28
Lorenzo Colitti [Fri, 18 Sep 2015 07:42:12 +0000 (07:42 +0000)]
am
fb0f565f: am
c280f399: am
7434d1f8: Merge "Allow run_net_test.sh to use a pre-existing kernel binary."
* commit '
fb0f565f67df611986933bdd791c70039cfdf34c':
Allow run_net_test.sh to use a pre-existing kernel binary.
Lorenzo Colitti [Fri, 18 Sep 2015 07:36:37 +0000 (07:36 +0000)]
am
c280f399: am
7434d1f8: Merge "Allow run_net_test.sh to use a pre-existing kernel binary."
* commit '
c280f39998f6954d7538ce1e7ac9388d55698a9c':
Allow run_net_test.sh to use a pre-existing kernel binary.
Lorenzo Colitti [Mon, 14 Sep 2015 05:54:55 +0000 (14:54 +0900)]
Add a crash test for tcp_nuke_addr.
Bug:
23663111
Change-Id: I3b79362d6a53b7689168488527059ae506161d5f
Lorenzo Colitti [Fri, 18 Sep 2015 07:27:59 +0000 (07:27 +0000)]
am
7434d1f8: Merge "Allow run_net_test.sh to use a pre-existing kernel binary."
* commit '
7434d1f8c965669c4a65d35e79086d757b0eb6db':
Allow run_net_test.sh to use a pre-existing kernel binary.
Lorenzo Colitti [Fri, 18 Sep 2015 07:23:13 +0000 (07:23 +0000)]
Merge "Allow run_net_test.sh to use a pre-existing kernel binary."
OSDN Git Service
