OSDN Git Service
Christopher Ferris [Thu, 12 Nov 2015 21:05:10 +0000 (21:05 +0000)]
Merge "Fix a size specification bug for the bandwidth test."
am:
df6a677fac
* commit '
df6a677fac4e74723de43c1ad8540c9bdd0d6ad4':
Fix a size specification bug for the bandwidth test.
Christopher Ferris [Thu, 12 Nov 2015 21:00:53 +0000 (21:00 +0000)]
Merge "Fix a size specification bug for the bandwidth test."
Ben Cheng [Tue, 10 Nov 2015 09:33:40 +0000 (17:33 +0800)]
Fix a size specification bug for the bandwidth test.
Change-Id: I38b5dc89edafd1768caa34158c2746c7ef35c31e
(cherry picked from commit
fb829a48d844b9769c5a52d1bb4d40d51ff4b6bc)
Christopher Ferris [Mon, 9 Nov 2015 21:08:51 +0000 (21:08 +0000)]
Merge "Do not try and sanitize memtest."
am:
442e95221f
* commit '
442e95221fb7fa4e98dab788b0382140843e32a1':
Do not try and sanitize memtest.
Christopher Ferris [Mon, 9 Nov 2015 21:06:47 +0000 (21:06 +0000)]
Merge "Do not try and sanitize memtest."
Christopher Ferris [Mon, 9 Nov 2015 21:03:52 +0000 (13:03 -0800)]
Do not try and sanitize memtest.
Bug:
25592757
Change-Id: I944bdabd7026251d903f9e3441859401fdcb872f
Erik Kline [Mon, 9 Nov 2015 08:20:38 +0000 (08:20 +0000)]
Merge "Use packets.py instead of old multinetwork_test.Packets"
am:
e883d56794
* commit '
e883d56794a07c09eb889e8a1bd51a963c3fc7b2':
Use packets.py instead of old multinetwork_test.Packets
Erik Kline [Mon, 9 Nov 2015 08:19:26 +0000 (08:19 +0000)]
Merge "Use packets.py instead of old multinetwork_test.Packets"
Erik Kline [Mon, 9 Nov 2015 07:29:00 +0000 (16:29 +0900)]
Use packets.py instead of old multinetwork_test.Packets
Change-Id: I39a36569a2df5b2a2a5b2bb323944864b284df0a
Lorenzo Colitti [Mon, 9 Nov 2015 06:54:26 +0000 (06:54 +0000)]
Merge "Pass more information to the attribute parsing functions."
am:
7a280cb2f7
* commit '
7a280cb2f78961ab245051e777fa354804e5af4a':
Pass more information to the attribute parsing functions.
Lorenzo Colitti [Mon, 9 Nov 2015 06:53:44 +0000 (06:53 +0000)]
Merge "Pass more information to the attribute parsing functions."
Lorenzo Colitti [Thu, 29 Oct 2015 15:14:10 +0000 (00:14 +0900)]
Pass more information to the attribute parsing functions.
Change-Id: I790dc54dd3de8a84758789d58f2ee17f175a6582
Lorenzo Colitti [Mon, 9 Nov 2015 06:47:19 +0000 (06:47 +0000)]
Merge changes I608c9974,Ic13456c5,Ie77b1591
am:
61205df5b4
* commit '
61205df5b44cc809f60714330686c887eeaf4037':
Support nested structs in CStruct.
Move common netlink code into a new netlink.py
Move the forwarding crash test to a new file.
Lorenzo Colitti [Mon, 9 Nov 2015 06:45:16 +0000 (06:45 +0000)]
Merge changes I608c9974,Ic13456c5,Ie77b1591
* changes:
Support nested structs in CStruct.
Move common netlink code into a new netlink.py
Move the forwarding crash test to a new file.
Lorenzo Colitti [Thu, 29 Oct 2015 14:47:31 +0000 (23:47 +0900)]
Support nested structs in CStruct.
Change-Id: I608c9974617a9c1e2c5555d499116f72456e532d
Lorenzo Colitti [Thu, 29 Oct 2015 14:51:09 +0000 (23:51 +0900)]
Move common netlink code into a new netlink.py
Change-Id: Ic13456c55707b1b73d6f2774b4232fa851cf853f
Lorenzo Colitti [Wed, 28 Oct 2015 08:50:04 +0000 (17:50 +0900)]
Move the forwarding crash test to a new file.
Change-Id: Ie77b1591338d8a3daae04f845798908ecc42874c
Will Drewry [Fri, 6 Nov 2015 02:15:25 +0000 (02:15 +0000)]
Merge "brillo_config: pull PRODUCT_VERSION from cfgtree"
am:
fe2032e0c0
* commit '
fe2032e0c0c2e1fb6a63e7f3ddb374063f66b9d0':
brillo_config: pull PRODUCT_VERSION from cfgtree
Will Drewry [Fri, 6 Nov 2015 02:12:58 +0000 (02:12 +0000)]
Merge "brillo_config: pull PRODUCT_VERSION from cfgtree"
Will Drewry [Fri, 6 Nov 2015 00:07:18 +0000 (16:07 -0800)]
brillo_config: pull PRODUCT_VERSION from cfgtree
Add support to read the product version from
config/brillo/product_version
Change-Id: Iee2394810b42fbab8be1e318373140f289f91346
Christopher Ferris [Thu, 5 Nov 2015 21:46:51 +0000 (21:46 +0000)]
Merge "Fix build on non-neon targets."
am:
de104595f3
* commit '
de104595f3b2001658b50278725d2a7491d724a6':
Fix build on non-neon targets.
Christopher Ferris [Thu, 5 Nov 2015 21:42:20 +0000 (21:42 +0000)]
Merge "Fix build on non-neon targets."
Christopher Ferris [Thu, 5 Nov 2015 21:41:24 +0000 (13:41 -0800)]
Fix build on non-neon targets.
Change-Id: I6f766ffcab394bd9d0e4f891ed2eff7ff1fa8fdc
Christopher Ferris [Thu, 5 Nov 2015 21:02:17 +0000 (21:02 +0000)]
Merge "Allow creating 32 bit memtest on arm64."
am:
a3ed8dc78d
* commit '
a3ed8dc78da05a47b127a9d2518961e63f28850e':
Allow creating 32 bit memtest on arm64.
Christopher Ferris [Thu, 5 Nov 2015 20:58:43 +0000 (20:58 +0000)]
Merge "Allow creating 32 bit memtest on arm64."
Christopher Ferris [Thu, 5 Nov 2015 20:53:10 +0000 (12:53 -0800)]
Allow creating 32 bit memtest on arm64.
Also do a bit of cleanup in the makefile and a few of the files.
Change-Id: I10d9442a5105f47fe361b5b4fb031989150429d3
Yabin Cui [Thu, 5 Nov 2015 18:27:43 +0000 (18:27 +0000)]
Merge "Simpleperf: add test for cpu offline whiling recording."
am:
09ae351f68
* commit '
09ae351f68315adb8921f7bb3e69cfaab83628e1':
Simpleperf: add test for cpu offline whiling recording.
Yabin Cui [Thu, 5 Nov 2015 18:23:25 +0000 (18:23 +0000)]
Merge "Simpleperf: add test for cpu offline whiling recording."
Will Drewry [Thu, 5 Nov 2015 03:29:46 +0000 (03:29 +0000)]
Merge "Populate BRILLO_PRODUCT_ID from the product config"
am:
d279f0614d
* commit '
d279f0614d32554b524ce1618751583b70f33b96':
Populate BRILLO_PRODUCT_ID from the product config
Will Drewry [Thu, 5 Nov 2015 03:27:14 +0000 (03:27 +0000)]
Merge "Populate BRILLO_PRODUCT_ID from the product config"
Will Drewry [Thu, 5 Nov 2015 02:51:35 +0000 (18:51 -0800)]
Populate BRILLO_PRODUCT_ID from the product config
Using cfgtree.mk, add support to load the brillo
product id directly from a file in the product tree
when configured.
BUG=
25343470
Change-Id: Icf9777915612bf3b3630112cfe31b95bae23612f
Yabin Cui [Wed, 4 Nov 2015 02:00:01 +0000 (18:00 -0800)]
Simpleperf: add test for cpu offline whiling recording.
Bug:
25193162
Change-Id: I17b34f4e6932698e158719b884efe8ab441fbdef
Bill Yi [Tue, 3 Nov 2015 22:30:41 +0000 (14:30 -0800)]
Yabin Cui [Fri, 30 Oct 2015 20:11:18 +0000 (20:11 +0000)]
Merge "simpleperf: support --cpu option in record/stat command."
am:
ce8a1f25ac
* commit '
ce8a1f25ace5a8c2e317a347f96d5e14e79d6f2b':
simpleperf: support --cpu option in record/stat command.
Yabin Cui [Fri, 30 Oct 2015 20:05:38 +0000 (20:05 +0000)]
Merge "simpleperf: support --cpu option in record/stat command."
Yabin Cui [Mon, 26 Oct 2015 23:15:29 +0000 (16:15 -0700)]
simpleperf: support --cpu option in record/stat command.
--cpu option is used to record on selected cpus.
Change-Id: If5bb9b42a064d2ff69fbeec77906fc79943dddc1
Bertrand Simonnet [Fri, 30 Oct 2015 18:33:20 +0000 (18:33 +0000)]
Merge "brillo_config: Don\'t cache the timestamp."
am:
63b10569b9
* commit '
63b10569b9cda3303bad274fee5126f4e8b3a386':
brillo_config: Don't cache the timestamp.
Bertrand Simonnet [Fri, 30 Oct 2015 18:29:10 +0000 (18:29 +0000)]
Merge "brillo_config: Don't cache the timestamp."
Bertrand SIMONNET [Thu, 29 Oct 2015 04:42:56 +0000 (21:42 -0700)]
brillo_config: Don't cache the timestamp.
We want the timestamp to change at every build as we may be using the
resulting image to generate an update and we need different images to
have different versions.
Bug:
25358721
Change-Id: I9ae0ae0ba34ea0f508fc3a5f051368e4bce57b61
Test: Build twice in a row, the timestamp is updated.
Sami Tolvanen [Fri, 30 Oct 2015 08:55:21 +0000 (08:55 +0000)]
Merge "ext4_utils: Parse unclean super block"
am:
a17cfd8b6d
* commit '
a17cfd8b6dfc820fd6ae88e0097387dc4a442235':
ext4_utils: Parse unclean super block
Sami Tolvanen [Fri, 30 Oct 2015 08:51:51 +0000 (08:51 +0000)]
Merge "ext4_utils: Parse unclean super block"
Johan Redestig [Thu, 29 Oct 2015 17:04:47 +0000 (18:04 +0100)]
ext4_utils: Parse unclean super block
Dont fail to parse the superblock just because the file system was
not unmounted cleanly.
Change-Id: I381c3e6c55ef5eb478b53d06d6cc56df1b6f41f4
Sami Tolvanen [Thu, 29 Oct 2015 16:45:08 +0000 (16:45 +0000)]
Merge "libfec: remove verity validation cache"
am:
98202de709
* commit '
98202de709ed70ec3b3e80baa061dfc064754b6b':
libfec: remove verity validation cache
Sami Tolvanen [Thu, 29 Oct 2015 16:03:07 +0000 (16:03 +0000)]
Merge "libfec: remove verity validation cache"
Sami Tolvanen [Thu, 29 Oct 2015 15:45:17 +0000 (15:45 +0000)]
libfec: remove verity validation cache
Caching block validation results increases libfec memory usage and
does not provide comparable benefits in normal use cases, which do
not involve re-reading the same blocks.
Change-Id: I71ac47a7059b350b16e32207932004f3f147abcb
Lorenzo Colitti [Wed, 28 Oct 2015 08:51:19 +0000 (08:51 +0000)]
Merge "Set accept_ra to 2 on all interfaces." am:
4ea2a41464
am:
81ab2106c4
* commit '
81ab2106c4a6f2d8f59b1fc5e383857855ff6668':
Set accept_ra to 2 on all interfaces.
Lorenzo Colitti [Wed, 28 Oct 2015 08:51:16 +0000 (08:51 +0000)]
Merge "Move packet definitions to their own file." am:
ed1aa266ce
am:
564a9cbd13
* commit '
564a9cbd1304a9311fff33c11f6686d20c9c2402':
Move packet definitions to their own file.
Lorenzo Colitti [Wed, 28 Oct 2015 08:48:38 +0000 (08:48 +0000)]
Merge "Set accept_ra to 2 on all interfaces."
am:
4ea2a41464
* commit '
4ea2a41464237deabff29bd29a9ffb621ac9f7af':
Set accept_ra to 2 on all interfaces.
Lorenzo Colitti [Wed, 28 Oct 2015 08:48:35 +0000 (08:48 +0000)]
Merge "Move packet definitions to their own file."
am:
ed1aa266ce
* commit '
ed1aa266cef795e383cc9a7ee77f860eaca8b7fe':
Move packet definitions to their own file.
Lorenzo Colitti [Wed, 28 Oct 2015 08:46:42 +0000 (08:46 +0000)]
Merge "Set accept_ra to 2 on all interfaces."
Lorenzo Colitti [Wed, 28 Oct 2015 08:45:28 +0000 (08:45 +0000)]
Merge "Move packet definitions to their own file."
Lorenzo Colitti [Wed, 28 Oct 2015 07:56:51 +0000 (16:56 +0900)]
Set accept_ra to 2 on all interfaces.
This matches what we do on real devices, and it makes it easier
to write tests that use forwarding.
Change-Id: I720a75864f8fb30b59ff023c33ef3f82d1f35b4b
Lorenzo Colitti [Wed, 28 Oct 2015 07:56:12 +0000 (16:56 +0900)]
Move packet definitions to their own file.
Change-Id: I68c57311915e2a8dbdb6842dfb87367485fcf819
Lorenzo Colitti [Wed, 28 Oct 2015 07:13:23 +0000 (07:13 +0000)]
Merge "Test SIOCKILLADDR on non-empty addresses too." am:
fa61997537
am:
e2f9e698bd
* commit '
e2f9e698bd0c8ae20d2673d477a57a837d914044':
Test SIOCKILLADDR on non-empty addresses too.
Lorenzo Colitti [Wed, 28 Oct 2015 07:09:15 +0000 (07:09 +0000)]
Merge "Test SIOCKILLADDR on non-empty addresses too."
am:
fa61997537
* commit '
fa6199753778e95a001400afa092a98395062ec9':
Test SIOCKILLADDR on non-empty addresses too.
Lorenzo Colitti [Wed, 28 Oct 2015 07:07:12 +0000 (07:07 +0000)]
Merge "Test SIOCKILLADDR on non-empty addresses too."
Lorenzo Colitti [Tue, 27 Oct 2015 08:37:00 +0000 (17:37 +0900)]
Test SIOCKILLADDR on non-empty addresses too.
Change-Id: Ifddc4e16c4cd59f96048dd517186d0a1f440f02c
Lorenzo Colitti [Tue, 27 Oct 2015 08:13:14 +0000 (08:13 +0000)]
Merge "Add a test for timewait crash." am:
82003283a2
am:
1e659e59f0
* commit '
1e659e59f054eb7414f97fdbd29b41b2b0cdd006':
Add a test for timewait crash.
Lorenzo Colitti [Tue, 27 Oct 2015 08:13:12 +0000 (08:13 +0000)]
Merge "Test nuking IPv4 sockets as well as IPv6." am:
f6dc5650be
am:
1634a952c6
* commit '
1634a952c67e75141f07285a7ccb8a2007f5113c':
Test nuking IPv4 sockets as well as IPv6.
Lorenzo Colitti [Tue, 27 Oct 2015 08:13:08 +0000 (08:13 +0000)]
Merge "Add functional tests for tcp_nuke_addr." am:
2f38d11b72
am:
94abb39ded
* commit '
94abb39dedb015f7a12ce331efe01eb754fd50cb':
Add functional tests for tcp_nuke_addr.
Lorenzo Colitti [Tue, 27 Oct 2015 08:08:52 +0000 (08:08 +0000)]
Merge "Add a test for timewait crash."
am:
82003283a2
* commit '
82003283a2679a21d91502e66765605254a7a1bb':
Add a test for timewait crash.
Lorenzo Colitti [Tue, 27 Oct 2015 08:08:49 +0000 (08:08 +0000)]
Merge "Test nuking IPv4 sockets as well as IPv6."
am:
f6dc5650be
* commit '
f6dc5650be488bbf50b53a9344ca9ed32ec46313':
Test nuking IPv4 sockets as well as IPv6.
Lorenzo Colitti [Tue, 27 Oct 2015 08:08:46 +0000 (08:08 +0000)]
Merge "Add functional tests for tcp_nuke_addr."
am:
2f38d11b72
* commit '
2f38d11b72f27104f3c8d04d28c71778cef4c107':
Add functional tests for tcp_nuke_addr.
Lorenzo Colitti [Tue, 27 Oct 2015 08:06:17 +0000 (08:06 +0000)]
Merge "Add a test for timewait crash."
Lorenzo Colitti [Tue, 27 Oct 2015 08:05:55 +0000 (08:05 +0000)]
Merge "Test nuking IPv4 sockets as well as IPv6."
Lorenzo Colitti [Tue, 27 Oct 2015 08:05:14 +0000 (08:05 +0000)]
Merge "Add functional tests for tcp_nuke_addr."
Lorenzo Colitti [Fri, 16 Oct 2015 04:52:11 +0000 (13:52 +0900)]
Add a test for timewait crash.
Change-Id: I6cbaf2274c002eeef97a62880f31c8546554765e
Lorenzo Colitti [Thu, 1 Oct 2015 08:36:37 +0000 (17:36 +0900)]
Test nuking IPv4 sockets as well as IPv6.
Also, for clarity, use cstruct.Struct to make the ifreq
structures instead of hand-packing them.
Change-Id: I917d6e38b3db067182ef1c971ff6c676fc2d7431
Lorenzo Colitti [Fri, 25 Sep 2015 08:43:55 +0000 (17:43 +0900)]
Add functional tests for tcp_nuke_addr.
1. Test for the hash table off-by-one error.
2. Test that sockets are closed and read() calls are interrupted
with ETIMEDOUT.
Change-Id: Id8cdd50f1f5447734c230341f73d71fcfecdddd8
Lorenzo Colitti [Tue, 27 Oct 2015 06:38:47 +0000 (06:38 +0000)]
Merge "Support reading /proc/net/tcp[6]." am:
794ea2d775
am:
a985b52811
* commit '
a985b528113e31a7d48c7fd6758fe465c4936491':
Support reading /proc/net/tcp[6].
Lorenzo Colitti [Tue, 27 Oct 2015 06:38:42 +0000 (06:38 +0000)]
Merge "Add support for iif rules." am:
60a057589f
am:
f9e010c6fe
* commit '
f9e010c6fef768a919cdc11df8932131da9ec512':
Add support for iif rules.
Lorenzo Colitti [Tue, 27 Oct 2015 06:35:56 +0000 (06:35 +0000)]
Merge "Make host network access optional." am:
021e773593
am:
fb61164cad
* commit '
fb61164cad4d38ecaefc903f81f18a708c2afa62':
Make host network access optional.
Lorenzo Colitti [Tue, 27 Oct 2015 06:35:53 +0000 (06:35 +0000)]
Merge "Fix ambiguous commit number." am:
8a6135bb2c
am:
8e20adb810
* commit '
8e20adb810cf3629e8fb12b7eb8fad5845266e6d':
Fix ambiguous commit number.
Lorenzo Colitti [Tue, 27 Oct 2015 06:35:49 +0000 (06:35 +0000)]
Merge "Make tcp_nuke_addr_test pass when run more than once." am:
2e3fb5e458
am:
e572b5a4ae
* commit '
e572b5a4ae5df0023c258381618dbcedf95d805c':
Make tcp_nuke_addr_test pass when run more than once.
Lorenzo Colitti [Tue, 27 Oct 2015 06:35:48 +0000 (06:35 +0000)]
Merge "Support reading /proc/net/tcp[6]."
am:
794ea2d775
* commit '
794ea2d775529863798cf5e0c7800586ade0d392':
Support reading /proc/net/tcp[6].
Lorenzo Colitti [Tue, 27 Oct 2015 06:35:45 +0000 (06:35 +0000)]
Merge "Add support for iif rules."
am:
60a057589f
* commit '
60a057589fa095a7fed16ea52a927916ab153781':
Add support for iif rules.
Lorenzo Colitti [Tue, 27 Oct 2015 06:35:45 +0000 (06:35 +0000)]
Merge "Add some Android-specific kernel options." am:
54f9bd922a
am:
516dd9426e
* commit '
516dd9426e370464aa4b9d19a6cc0b81bced9eb8':
Add some Android-specific kernel options.
Lorenzo Colitti [Tue, 27 Oct 2015 06:33:36 +0000 (06:33 +0000)]
Merge "Support reading /proc/net/tcp[6]."
Lorenzo Colitti [Tue, 27 Oct 2015 06:33:10 +0000 (06:33 +0000)]
Merge "Add support for iif rules."
Lorenzo Colitti [Tue, 27 Oct 2015 06:33:07 +0000 (06:33 +0000)]
Merge "Make host network access optional."
am:
021e773593
* commit '
021e773593ca2893d66c26882e53f25307c4e96b':
Make host network access optional.
Lorenzo Colitti [Tue, 27 Oct 2015 06:33:04 +0000 (06:33 +0000)]
Merge "Fix ambiguous commit number."
am:
8a6135bb2c
* commit '
8a6135bb2c0e5dd2fd7c53792bc3c992f58ba085':
Fix ambiguous commit number.
Lorenzo Colitti [Tue, 27 Oct 2015 06:33:01 +0000 (06:33 +0000)]
Merge "Make tcp_nuke_addr_test pass when run more than once."
am:
2e3fb5e458
* commit '
2e3fb5e458b10fecc616bdda08760e9a63de902a':
Make tcp_nuke_addr_test pass when run more than once.
Lorenzo Colitti [Tue, 27 Oct 2015 06:32:57 +0000 (06:32 +0000)]
Merge "Add some Android-specific kernel options."
am:
54f9bd922a
* commit '
54f9bd922ac5d4fcfaa34e5878d6de264a565fde':
Add some Android-specific kernel options.
Lorenzo Colitti [Tue, 27 Oct 2015 06:32:41 +0000 (06:32 +0000)]
Merge "Make host network access optional."
Lorenzo Colitti [Tue, 27 Oct 2015 06:31:03 +0000 (06:31 +0000)]
Merge "Fix ambiguous commit number."
Lorenzo Colitti [Tue, 27 Oct 2015 06:30:53 +0000 (06:30 +0000)]
Merge "Make tcp_nuke_addr_test pass when run more than once."
Lorenzo Colitti [Tue, 27 Oct 2015 06:30:35 +0000 (06:30 +0000)]
Merge "Add some Android-specific kernel options."
Lorenzo Colitti [Fri, 16 Oct 2015 04:37:33 +0000 (13:37 +0900)]
Support reading /proc/net/tcp[6].
Support the two different TCP socket formats, and move the
parsing code to net_test.py so it can be used for other things
apart from ping.
Change-Id: Iaa10cc323d11834b6ac9429d42708f6cdf89f404
Lorenzo Colitti [Fri, 16 Oct 2015 04:01:35 +0000 (13:01 +0900)]
Add support for iif rules.
On real systems, we use this to set up tethering.
Change-Id: I0896191754c81e385a08b325922ad42230980d9e
Lorenzo Colitti [Fri, 16 Oct 2015 03:57:39 +0000 (12:57 +0900)]
Make host network access optional.
This isn't required to run the tests, so it's an unnecessary
burden - it needs uml_utilities installed, needs root access,
and doesn't even perform a full network setup.
Change-Id: I8b0c3783290526909de9fe7d40ecaf7399891ba8
Yabin Cui [Mon, 26 Oct 2015 21:04:47 +0000 (21:04 +0000)]
Merge "Simpleperf: Don\'t load whole perf.data into memory." am:
c5ca81d0d4
am:
0cf5336622
* commit '
0cf5336622366a85d11c305774c3146023fda5cd':
Simpleperf: Don't load whole perf.data into memory.
Yabin Cui [Mon, 26 Oct 2015 21:01:38 +0000 (21:01 +0000)]
Merge "Simpleperf: Don\'t load whole perf.data into memory."
am:
c5ca81d0d4
* commit '
c5ca81d0d4adc1da4325a89dc958b515691a4e0d':
Simpleperf: Don't load whole perf.data into memory.
Yabin Cui [Mon, 26 Oct 2015 20:57:19 +0000 (20:57 +0000)]
Merge "Simpleperf: Don't load whole perf.data into memory."
Dan Albert [Mon, 26 Oct 2015 18:36:14 +0000 (18:36 +0000)]
Merge "Always use clang for iotop." am:
18bf41fbe2
am:
b87f8f262d
* commit '
b87f8f262d7178307cce84b7832aa4972dab53f3':
Always use clang for iotop.
Dan Albert [Mon, 26 Oct 2015 18:32:49 +0000 (18:32 +0000)]
Merge "Always use clang for iotop."
am:
18bf41fbe2
* commit '
18bf41fbe2cf8af53b3732a68c20d280c86a60e5':
Always use clang for iotop.
Dan Albert [Mon, 26 Oct 2015 18:29:22 +0000 (18:29 +0000)]
Merge "Always use clang for iotop."
Dan Albert [Mon, 26 Oct 2015 18:24:47 +0000 (11:24 -0700)]
Always use clang for iotop.
iotop makes use of a lambda that uses an `auto` typedef parameter.
This is a C++14 feature, and we need to move GCC back to C++11 because
GCC 4.9 doesn't have a correct C++14 ABI.
Bug: http://b/
25022512
Change-Id: I3946bd3d287c99eeee1d570ea46e073828b5c1d2
Than McIntosh [Mon, 26 Oct 2015 12:27:28 +0000 (12:27 +0000)]
Merge "Reduce oom_score_adj to zero for perfprofd." am:
5157212f42
am:
ecdaa52106
* commit '
ecdaa52106aa2d77461e491a430d1073222cd42b':
Reduce oom_score_adj to zero for perfprofd.
Than McIntosh [Mon, 26 Oct 2015 12:24:11 +0000 (12:24 +0000)]
Merge "Reduce oom_score_adj to zero for perfprofd."
am:
5157212f42
* commit '
5157212f42fcf90a2ce136b795c092bbffd41d54':
Reduce oom_score_adj to zero for perfprofd.
Than McIntosh [Mon, 26 Oct 2015 12:21:01 +0000 (12:21 +0000)]
Merge "Reduce oom_score_adj to zero for perfprofd."
OSDN Git Service
