OSDN Git Service
Yabin Cui [Fri, 30 Oct 2015 20:15:04 +0000 (20:15 +0000)]
Merge "simpleperf: support --cpu option in record/stat command." am:
ce8a1f25ac
am:
8f383b86f2
* commit '
8f383b86f28b62a78f27833404840132bd3707f2':
simpleperf: support --cpu option in record/stat command.
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:36:19 +0000 (18:36 +0000)]
Merge "brillo_config: Don\'t cache the timestamp." am:
63b10569b9
am:
4cf4f5c152
* commit '
4cf4f5c1520863269575b032c559e45625762c0b':
brillo_config: Don't cache the timestamp.
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:58:11 +0000 (08:58 +0000)]
Merge "ext4_utils: Parse unclean super block" am:
a17cfd8b6d
am:
0525bd6eae
* commit '
0525bd6eae33f9f8a1e8c593d1e87290f28c458e':
ext4_utils: Parse unclean super block
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:49:31 +0000 (16:49 +0000)]
Merge "libfec: remove verity validation cache" am:
98202de709
am:
72b11684dd
* commit '
72b11684dd23cfdeaeef103b02744775948a72d0':
libfec: remove verity validation cache
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."
Lorenzo Colitti [Thu, 1 Oct 2015 08:35:29 +0000 (17:35 +0900)]
Fix ambiguous commit number.
Change-Id: I5081c360a8ab996d7c77e41c099e4acdd65a8ce2
Yabin Cui [Sat, 24 Oct 2015 02:48:42 +0000 (19:48 -0700)]
Simpleperf: Don't load whole perf.data into memory.
perf.data can be too large to be loaded into memory.
To avoid this, use fread() instead of mmap() to read perf.data,
and always use RecordCache to sort records.
Fix unit tests failure caused by previous change.
Bug:
25194400
Change-Id: If29dc0bb0ed992ba34202c2cb1a204a1d9123b7a
Than McIntosh [Fri, 23 Oct 2015 17:15:07 +0000 (13:15 -0400)]
Reduce oom_score_adj to zero for perfprofd.
Up until this point perfprofd has inherited a
decreased OOM score of -1000 from init -- this
doens't make sense given that perfprofd is not
a critical system service. This fixes perfprofd to
reduce its oom_score_adj to 0.
Bug:
25216630
Change-Id: Ica8a300d8c33016bcbd3b0ecd25393828654878e
Yabin Cui [Fri, 23 Oct 2015 01:18:53 +0000 (01:18 +0000)]
Merge "Simpleperf: fix some unknown symbols for report result." am:
6fea45816a
am:
61017b4731
* commit '
61017b473139fc99bda5537383afcc3bbfc1a989':
Simpleperf: fix some unknown symbols for report result.
Yabin Cui [Fri, 23 Oct 2015 01:16:38 +0000 (01:16 +0000)]
Merge "Simpleperf: fix some unknown symbols for report result."
am:
6fea45816a
* commit '
6fea45816ae5ce22b9f186a1fc4b447a42ece10f':
Simpleperf: fix some unknown symbols for report result.
Yabin Cui [Fri, 23 Oct 2015 01:14:16 +0000 (01:14 +0000)]
Merge "Simpleperf: fix some unknown symbols for report result."
Yabin Cui [Mon, 12 Oct 2015 23:56:05 +0000 (16:56 -0700)]
Simpleperf: fix some unknown symbols for report result.
Using debug shared libraries in /usr/lib/debug on linux host.
Match ip addresses with symbols by symbols' virtual addresses instead of
file offsets in elf file. Because symbols' file offsets in debug shared
libraries are different from those in original shared libraries.
Fix overlapped maps.
Bug:
24716851
Change-Id: I9cb64958c4de5c7a6c77c3febc5f689cf2df650f
Yabin Cui [Fri, 23 Oct 2015 00:24:00 +0000 (00:24 +0000)]
Merge "Simpleperf: do stack unwinding while recording." am:
e7182b0cc4
am:
6cad5f5048
* commit '
6cad5f504898b6ae5b39537d1fb8f15675175183':
Simpleperf: do stack unwinding while recording.
Yabin Cui [Fri, 23 Oct 2015 00:21:14 +0000 (00:21 +0000)]
Merge "Simpleperf: do stack unwinding while recording."
am:
e7182b0cc4
* commit '
e7182b0cc45b447943b51e36aa1feb2d17257875':
Simpleperf: do stack unwinding while recording.
Yabin Cui [Fri, 23 Oct 2015 00:17:29 +0000 (00:17 +0000)]
Merge "Simpleperf: do stack unwinding while recording."
Kenny Root [Thu, 22 Oct 2015 00:13:49 +0000 (00:13 +0000)]
Merge "system/extras: remove BORINGSSL_201509 support." am:
b5ff8a9895
am:
3746ef3d16
* commit '
3746ef3d1662e96e528c30eefcd0504be5d5a2a0':
system/extras: remove BORINGSSL_201509 support.
Kenny Root [Thu, 22 Oct 2015 00:11:39 +0000 (00:11 +0000)]
Merge "system/extras: remove BORINGSSL_201509 support."
am:
b5ff8a9895
* commit '
b5ff8a9895b21da46a7d0c6b082db363e1f9929d':
system/extras: remove BORINGSSL_201509 support.
Kenny Root [Thu, 22 Oct 2015 00:09:39 +0000 (00:09 +0000)]
Merge "system/extras: remove BORINGSSL_201509 support."
Christopher Ferris [Wed, 21 Oct 2015 20:01:45 +0000 (20:01 +0000)]
Merge "Add timing of allocation functions." am:
3d614a17ef
am:
77b1d6fcf2
* commit '
77b1d6fcf288c3bc06106fc34eca129c8e521c18':
Add timing of allocation functions.
Christopher Ferris [Wed, 21 Oct 2015 19:59:35 +0000 (19:59 +0000)]
Merge "Add timing of allocation functions."
am:
3d614a17ef
* commit '
3d614a17efc2661dc491dafa9a18d20bac1ab964':
Add timing of allocation functions.
Christopher Ferris [Wed, 21 Oct 2015 19:44:14 +0000 (19:44 +0000)]
Merge "Add timing of allocation functions."
Christopher Ferris [Wed, 14 Oct 2015 20:25:15 +0000 (13:25 -0700)]
Add timing of allocation functions.
Report the time it takes to execute every different allocation function
during the replay.
Change-Id: I4e8321409357824c10f2f176b02c7c33538d353b
Elliott Hughes [Tue, 20 Oct 2015 20:48:31 +0000 (20:48 +0000)]
Merge "Fix lseek argument order." am:
5321b63ea2
am:
3d9578316f
* commit '
3d9578316f5ea702c455e74aceae0a486986e99a':
Fix lseek argument order.
Elliott Hughes [Tue, 20 Oct 2015 20:37:10 +0000 (20:37 +0000)]
Merge "Fix lseek argument order."
am:
5321b63ea2
* commit '
5321b63ea2063e4246543009c763584498d1e56d':
Fix lseek argument order.
Elliott Hughes [Tue, 20 Oct 2015 20:28:29 +0000 (20:28 +0000)]
Merge "Fix lseek argument order."
Mike Frysinger [Tue, 20 Oct 2015 20:18:12 +0000 (20:18 +0000)]
Merge "brillo_config: add missing mkdir for product rules" am:
01e57b832a
am:
5dbfe0ac9e
* commit '
5dbfe0ac9e7ea22cd0cabf94c5d3663980b7254c':
brillo_config: add missing mkdir for product rules
Elliott Hughes [Tue, 20 Oct 2015 20:14:28 +0000 (13:14 -0700)]
Fix lseek argument order.
Change-Id: I782d17a0678d7e74be89c46c42de942129750e55
Mike Frysinger [Tue, 20 Oct 2015 20:11:53 +0000 (20:11 +0000)]
Merge "brillo_config: add missing mkdir for product rules"
am:
01e57b832a
* commit '
01e57b832ab732199824ac6bda0b804eaad62b94':
brillo_config: add missing mkdir for product rules
Mike Frysinger [Tue, 20 Oct 2015 19:25:39 +0000 (19:25 +0000)]
Merge "brillo_config: add missing mkdir for product rules"
Mike Frysinger [Tue, 20 Oct 2015 18:11:47 +0000 (14:11 -0400)]
brillo_config: add missing mkdir for product rules
When doing a clean build, creating this file fails because the dir does
not yet exist:
echo "" > out/target/product/brilloemulator_arm/obj/ETC/product_id_intermediates/product_id
/bin/bash: out/target/product/brilloemulator_arm/obj/ETC/product_id_intermediates/product_id: No such file or directory
BUG:
24585672
Change-Id: I9c4a646b8d86cd303b0114f9b64d02896797f720
Sami Tolvanen [Tue, 20 Oct 2015 14:29:16 +0000 (14:29 +0000)]
Merge "libfec: add a function to disable verity" am:
c3788283d7
am:
964746605c
* commit '
964746605c96b8bea882b6ef173bc4b54e1ddd94':
libfec: add a function to disable verity
Sami Tolvanen [Tue, 20 Oct 2015 14:25:41 +0000 (14:25 +0000)]
Merge "libfec: add a function to disable verity"
am:
c3788283d7
* commit '
c3788283d70eb8b0ad5b9a0e224108262beb84b5':
libfec: add a function to disable verity
Sami Tolvanen [Tue, 20 Oct 2015 14:22:42 +0000 (14:22 +0000)]
Merge "libfec: add a function to disable verity"
Sami Tolvanen [Tue, 20 Oct 2015 12:23:19 +0000 (13:23 +0100)]
libfec: add a function to disable verity
Add fec_verity_set_status to allow disabling verity on userdebug
builds by updating metadata magic.
Change-Id: I02f83b0d1d4e7ef5cd5d13a37ff0b84f17e23376