OSDN Git Service
Rom Lemarchand [Tue, 28 Jun 2016 21:55:23 +0000 (21:55 +0000)]
Merge \"pagingtest: fix large read errors\"
am:
d937202a3b
Change-Id: If90cfaa7ed7769b760c57aace300fa2b10bed8df
Treehugger Robot [Tue, 28 Jun 2016 21:30:42 +0000 (21:30 +0000)]
Merge "pagingtest: fix large read errors"
Than McIntosh [Tue, 28 Jun 2016 18:12:53 +0000 (18:12 +0000)]
Merge \"Switch to new encoding scheme for large records.\"
am:
0380bb5f26
Change-Id: Ib6daa6183bcfb989ef52b71d4c9d012fd6884529
Than McIntosh [Tue, 28 Jun 2016 18:07:12 +0000 (18:07 +0000)]
Merge "Switch to new encoding scheme for large records."
Yabin Cui [Tue, 28 Jun 2016 17:18:23 +0000 (17:18 +0000)]
Merge \"Simpleperf: Add SPLIT and SPLIT_END records to handle big records.\"
am:
6d20b67da5
Change-Id: I105cbdd688b50ce64450e8819b8d7ef28c15b838
Treehugger Robot [Tue, 28 Jun 2016 17:09:26 +0000 (17:09 +0000)]
Merge "Simpleperf: Add SPLIT and SPLIT_END records to handle big records."
Than McIntosh [Tue, 28 Jun 2016 15:50:11 +0000 (11:50 -0400)]
Switch to new encoding scheme for large records.
Move to the new SPLIT/SPLIT_END encoding scheme used
by simpleperf for records with oversized (more than 2^16 bytes)
payloads.
Bug:
29818021
Change-Id: I40126748dbe9b07b107c85b891f7aafbc556ae1f
Rom Lemarchand [Tue, 28 Jun 2016 14:51:33 +0000 (07:51 -0700)]
pagingtest: fix large read errors
Some kernels have a limit on the length of reads from urandom - fix
Change-Id: I67dda25c2e43121da1470a56e40d03c59fd5fabe
Yabin Cui [Tue, 28 Jun 2016 00:21:37 +0000 (17:21 -0700)]
resolve merge conflicts of
a486a4b to nyc-dev-plus-aosp
Change-Id: Iad2f0b498d7abd2eb52116a32517bfee20129f05
Yabin Cui [Mon, 27 Jun 2016 23:00:20 +0000 (16:00 -0700)]
Simpleperf: fix flaky tests.
Simpleperf stat/record command may need 1 second to set security.perf_harden
property. So the monitored child threads should run longer than 1 second.
Bug:
29763505
Change-Id: I9bf6dcba03f3fc5c91130f38a08ce0062e104103
Yabin Cui [Fri, 24 Jun 2016 00:11:14 +0000 (17:11 -0700)]
Simpleperf: Add SPLIT and SPLIT_END records to handle big records.
Previously we split KernelSymbolRecord because it is > 65535. Then
I found TracingDataRecord can also be > 65535. So it is better to
handle big records when reading and writing perf.data.
record_file_writer.cpp splits a big record into multiple SPLIT
records followed by a SPLIT_END record, and record_file_reader.cpp
restores the big record when reading SPLIT and SPLIT_END records.
Also Add RecordHeader to represent record having size > 65535.
Bug:
29581559
Change-Id: I0b4556988f77b3431c7f1a28fce65cf225d6a067
Test: run simpleperf_unit_test.
Dan Willemsen [Thu, 23 Jun 2016 01:12:30 +0000 (01:12 +0000)]
Merge \\"Dist simpleperf executables in SDK targets\\" am:
965a99e493
am:
aab6d80c06
Change-Id: I1d71111e4238ca9a2b87045d46485369e0271984
Dan Willemsen [Thu, 23 Jun 2016 01:09:32 +0000 (01:09 +0000)]
Merge \"Dist simpleperf executables in SDK targets\"
am:
965a99e493
Change-Id: I35d4bb08697e32c889a5d0a4baa82de7ec79c9b8
Treehugger Robot [Thu, 23 Jun 2016 01:00:39 +0000 (01:00 +0000)]
Merge "Dist simpleperf executables in SDK targets"
Yabin Cui [Thu, 23 Jun 2016 00:02:11 +0000 (00:02 +0000)]
Merge \\"Simpleperf: use libc++_static on host.\\" am:
185f314239
am:
b76a0affbd
Change-Id: I9d6da22c618df56e5da08413ceb7eca6ce965a32
Yabin Cui [Wed, 22 Jun 2016 23:59:16 +0000 (23:59 +0000)]
Merge \"Simpleperf: use libc++_static on host.\"
am:
185f314239
Change-Id: Ia1b208c8e6120caef5fc7bb0cd2b0ab488fe1d32
Yabin Cui [Wed, 22 Jun 2016 23:49:12 +0000 (23:49 +0000)]
Merge "Simpleperf: use libc++_static on host."
Dan Willemsen [Wed, 22 Jun 2016 23:41:36 +0000 (16:41 -0700)]
Dist simpleperf executables in SDK targets
Bug:
28911532
Change-Id: I5ec387ee1bbdff1e62788aa1fe3995cb44b37754
Yabin Cui [Wed, 22 Jun 2016 22:58:43 +0000 (22:58 +0000)]
Merge \\"Simpleperf: report lost record count and warn if 10% records are lost.\\" am:
142b63f4e7
am:
d3e37d55f1
Change-Id: I0cad51ed45ababb34d91f8b2a1359920da3b6ae4
Yabin Cui [Wed, 22 Jun 2016 22:56:08 +0000 (22:56 +0000)]
Merge \"Simpleperf: report lost record count and warn if 10% records are lost.\"
am:
142b63f4e7
Change-Id: Id09c49521f8ae2d0e7b11a9607e6c5d2bb1cbad6
Yabin Cui [Wed, 22 Jun 2016 22:48:25 +0000 (22:48 +0000)]
Merge "Simpleperf: report lost record count and warn if 10% records are lost."
Yabin Cui [Wed, 22 Jun 2016 22:30:37 +0000 (15:30 -0700)]
Simpleperf: use libc++_static on host.
Bug:
28911532
Change-Id: I5cc97fc35f5c5225ea81bdaec04cc22d9a99790f
Test: Use readelf to make sure simpleperf on host doesn't dynamically link libc++.so.
Yabin Cui [Wed, 22 Jun 2016 21:28:47 +0000 (21:28 +0000)]
Merge \\"Simpleperf: adjust default mmap_pages for system wide profiling.\\" am:
b2fae142fb
am:
7d8c686f23
Change-Id: Icbb019b43cb981c0694f3dc4b2f3c2cd4dc09ee8
Yabin Cui [Wed, 22 Jun 2016 21:28:46 +0000 (21:28 +0000)]
Merge \\"Simpleperf: check if -f option for record command is in valid range.\\" am:
d954410cc5
am:
6f63f7c869
Change-Id: Ifaab77fec55286a3f9831b181e1104050e83cb6c
Yabin Cui [Wed, 22 Jun 2016 21:28:46 +0000 (21:28 +0000)]
Merge \\"Simpleperf: check root privilege for system wide profiling.\\" am:
a961ee585d
am:
91d9d854ab
Change-Id: I911e49326142c1bf34fa1de8f776782475187880
Yabin Cui [Wed, 22 Jun 2016 21:26:23 +0000 (21:26 +0000)]
Merge \"Simpleperf: adjust default mmap_pages for system wide profiling.\"
am:
b2fae142fb
Change-Id: I59e376723899d94ef33738e04724d532473bc6a9
Yabin Cui [Wed, 22 Jun 2016 21:26:22 +0000 (21:26 +0000)]
Merge \"Simpleperf: check if -f option for record command is in valid range.\"
am:
d954410cc5
Change-Id: I80c6fd82200c56a7d0fc5c0c06b5483bdd0d0451
Yabin Cui [Wed, 22 Jun 2016 21:26:21 +0000 (21:26 +0000)]
Merge \"Simpleperf: check root privilege for system wide profiling.\"
am:
a961ee585d
Change-Id: Id1af325025b22cca657ae18fe5f4b6d43f53d4fa
Yabin Cui [Wed, 22 Jun 2016 18:37:26 +0000 (11:37 -0700)]
Simpleperf: report lost record count and warn if 10% records are lost.
Bug:
29126335
Change-Id: Id4a5b51120389387ec3ab45ea9ad9a276aa6ce2a
Test: run simpleperf with high -f option and check the lost record warning.
Yabin Cui [Wed, 22 Jun 2016 21:19:54 +0000 (21:19 +0000)]
Merge "Simpleperf: adjust default mmap_pages for system wide profiling."
Yabin Cui [Wed, 22 Jun 2016 21:19:41 +0000 (21:19 +0000)]
Merge "Simpleperf: check if -f option for record command is in valid range."
Yabin Cui [Wed, 22 Jun 2016 21:19:25 +0000 (21:19 +0000)]
Merge "Simpleperf: check root privilege for system wide profiling."
Yabin Cui [Wed, 22 Jun 2016 19:43:09 +0000 (12:43 -0700)]
Simpleperf: check if -f option for record command is in valid range.
Read /proc/sys/kernel/perf_event_max_sample_rate to get max
valid sample frequency.
Bug:
29574526
Change-Id: I269fefc87a7561bb15f41c3b4a494e7604e005fb
Test: Run `simpleperf record -f
10000000`, check the error message.
Yabin Cui [Wed, 22 Jun 2016 19:14:45 +0000 (12:14 -0700)]
Simpleperf: check root privilege for system wide profiling.
Giving the suggestion to run as root is better than reporting
a bunch of failures trying to open perf_event files.
Bug:
29574526
Change-Id: Id7b7586a5aa7e79e4ef821f9ab710ccdf550ed94
Test: run `simpleperf record -a` with non root and check the error message.
Yabin Cui [Wed, 22 Jun 2016 19:07:21 +0000 (12:07 -0700)]
Simpleperf: adjust default mmap_pages for system wide profiling.
System wide profiling have much more records to pass between kernel
and simpleperf, thus it needs a larger buffer than process profiling.
Bug:
29126335
Change-Id: I2eeb273096bb9786d9b37b17bb8745c1d3b3de74
Test: Run `simpleperf record -a` gives almost zero lost samples.
Yabin Cui [Tue, 21 Jun 2016 17:22:06 +0000 (17:22 +0000)]
Merge \\"simpleperf: add kmem command to report slab allocation information.\\" am:
cee718a1c6
am:
1c05fae8ef
Change-Id: I164fc1ee96153c80376c64ab60934f6555de0177
Yabin Cui [Tue, 21 Jun 2016 17:16:54 +0000 (17:16 +0000)]
Merge \"simpleperf: add kmem command to report slab allocation information.\"
am:
cee718a1c6
Change-Id: I71d41847471ad07c6e88b8b82d4b475caad1f10e
Yabin Cui [Tue, 21 Jun 2016 17:03:06 +0000 (17:03 +0000)]
Merge "simpleperf: add kmem command to report slab allocation information."
Yabin Cui [Wed, 15 Jun 2016 18:41:42 +0000 (11:41 -0700)]
simpleperf: add kmem command to report slab allocation information.
Bug:
27403614
Change-Id: Id3015a4828ec32170ea1db3a1580b14a8bd159ba
Yabin Cui [Sat, 18 Jun 2016 01:08:41 +0000 (01:08 +0000)]
Merge \\"simpleperf: support event group.\\" am:
d5822b9d35
am:
733e4d06fb
Change-Id: I5ddace20c039e30eb973f339a847a13fa6dd079a
Yabin Cui [Sat, 18 Jun 2016 01:05:53 +0000 (01:05 +0000)]
Merge \"simpleperf: support event group.\"
am:
d5822b9d35
Change-Id: Ia604d089f8cda23e26f86c66113fa1a2d3e75de2
Yabin Cui [Sat, 18 Jun 2016 00:58:28 +0000 (00:58 +0000)]
Merge "simpleperf: support event group."
Yabin Cui [Tue, 14 Jun 2016 01:03:47 +0000 (18:03 -0700)]
simpleperf: support event group.
Kernel supports monitoring several events as a group, so they are
scheduled on and out at the same time. Add --group option to
stat command and record command.
Adjust the method to calculate miss rate in stat command: limit
the matched events in the same group or with scale == 1.0.
Bug:
29213742
Change-Id: I899aba207f1e3357307541e81f97526f5a2913c3
Badhri Jagan Sridharan [Fri, 17 Jun 2016 03:02:03 +0000 (03:02 +0000)]
Merge \\"libfec: pack the fec_header structure\\" am:
c2174a1934
am:
bf504f017e
Change-Id: I696560cfb458f72f4162eecccee30026d68edf42
Jeremy Compostella [Fri, 17 Jun 2016 02:58:59 +0000 (02:58 +0000)]
Merge \"libfec: pack the fec_header structure\"
am:
c2174a1934
Change-Id: Ifd15a6f8c35ba93948261b532a795da2a67d95ac
Badhri Jagan Sridharan [Fri, 17 Jun 2016 02:48:17 +0000 (02:48 +0000)]
Merge "libfec: pack the fec_header structure"
Mohamad Ayyash [Thu, 16 Jun 2016 16:39:40 +0000 (16:39 +0000)]
Merge \"mksquashfsimage.sh: Make disable-4k-align a paramter\" into nyc-dev
am:
041bdd8e10
Change-Id: I601f54dcb907f1cbb247d8f1d4ef43871d5f92a7
Mohamad Ayyash [Thu, 16 Jun 2016 16:24:33 +0000 (16:24 +0000)]
Merge "mksquashfsimage.sh: Make disable-4k-align a paramter" into nyc-dev
Yabin Cui [Wed, 15 Jun 2016 23:24:07 +0000 (23:24 +0000)]
Merge \\"simpleperf: add type modifier when reporting events.\\" am:
90d56472a6
am:
fb768fd700
Change-Id: I544470c367fa0b188b5bb0a1b570efcddd0bdec1
Yabin Cui [Wed, 15 Jun 2016 23:21:39 +0000 (23:21 +0000)]
Merge \"simpleperf: add type modifier when reporting events.\"
am:
90d56472a6
Change-Id: Iee188f56a1d74e972898f011e7d1bfc2a9e8ce12
Mohamad Ayyash [Wed, 15 Jun 2016 22:53:55 +0000 (15:53 -0700)]
mksquashfsimage.sh: Make disable-4k-align a paramter
BUG:
29388879
Change-Id: I6ede2273419ba986d08decc0540741c54ed736b1
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Yabin Cui [Wed, 15 Jun 2016 22:50:12 +0000 (22:50 +0000)]
Merge "simpleperf: add type modifier when reporting events."
Yabin Cui [Wed, 15 Jun 2016 22:28:16 +0000 (22:28 +0000)]
Merge \\"simpleperf: replace SIMPLEPERF_ALIGN macro with Align inline function.\\" am:
82cc1bf01d
am:
bf66399909
Change-Id: Iece599050c969665d2f03b20dc382d074b94b4ca
Yabin Cui [Wed, 15 Jun 2016 22:22:28 +0000 (22:22 +0000)]
Merge \"simpleperf: replace SIMPLEPERF_ALIGN macro with Align inline function.\"
am:
82cc1bf01d
Change-Id: I4e62a848ea0a5299c8884ecaa335698f3a439891
Yabin Cui [Wed, 15 Jun 2016 21:50:10 +0000 (21:50 +0000)]
Merge "simpleperf: replace SIMPLEPERF_ALIGN macro with Align inline function."
Yabin Cui [Wed, 15 Jun 2016 19:10:33 +0000 (12:10 -0700)]
simpleperf: add type modifier when reporting events.
Before the change:
$simpleperf record -e cpu-cycles:u sleep 1
$simpleperf report
...
Event: cpu-cycles (type 0, config 0)
...
After the change:
$simpleperf report
...
Event: cpu-cycles:u (type 0, config 0)
...
Change-Id: I296c5476e03250e928ed0f579483d6866576d417
Yabin Cui [Wed, 15 Jun 2016 18:49:23 +0000 (11:49 -0700)]
simpleperf: replace SIMPLEPERF_ALIGN macro with Align inline function.
Change-Id: Id9e9e67174ab3f857eb2baa9609351b60586b8dd
Mohamad Ayyash [Wed, 15 Jun 2016 16:12:54 +0000 (16:12 +0000)]
Merge changes from topic \'squashfs_ota_incrementals\' into nyc-dev
am:
7354c0e18b
Change-Id: I46e8cfc15ebdcaba6da52f016a29146c2e92dab2
Mohamad Ayyash [Wed, 15 Jun 2016 16:03:08 +0000 (16:03 +0000)]
Merge changes from topic 'squashfs_ota_incrementals' into nyc-dev
* changes:
Disable fragments and duplicates detection for squashfs
mksquashfsimage.sh: Add support for passing block map files
Tao Bao [Tue, 14 Jun 2016 16:23:01 +0000 (16:23 +0000)]
Merge \\"boot_control_copy: Track the the bootloader_message struct change.\\" am:
42ca0e1992
am:
713a9a5c19
Change-Id: Iefde6de81a2a566b66a51b707ea0aa8a3dfb24d2
Tao Bao [Tue, 14 Jun 2016 16:18:27 +0000 (16:18 +0000)]
Merge \"boot_control_copy: Track the the bootloader_message struct change.\"
am:
42ca0e1992
Change-Id: If4d94cbe24619b3e9f7f7924d2e76dfe25b78f46
Tao Bao [Tue, 14 Jun 2016 16:09:16 +0000 (16:09 +0000)]
Merge "boot_control_copy: Track the the bootloader_message struct change."
Mohamad Ayyash [Tue, 24 May 2016 20:53:53 +0000 (13:53 -0700)]
Disable fragments and duplicates detection for squashfs
They don't play nicely with generating block maps. Fragments reduce
performance. A later patch will add workaround for duplicate detection.
BUG:
22322817
Change-Id: I01c731202ef7a2450b5d1beca627a0158c9cc3b4
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Mohamad Ayyash [Mon, 13 Jun 2016 21:45:31 +0000 (14:45 -0700)]
mksquashfsimage.sh: Add support for passing block map files
BUG:
22322817
Change-Id: I7e17f6ad3a503ee97f7a81a1a8382cff47a913c6
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Yabin Cui [Tue, 14 Jun 2016 01:52:57 +0000 (01:52 +0000)]
Merge \\"simpleperf: fix mac build.\\" am:
898b3f48e2
am:
ab0531d484
Change-Id: Iae639a12f2629774731b4ab7d85eab1b6755efd7
Yabin Cui [Tue, 14 Jun 2016 01:47:48 +0000 (01:47 +0000)]
Merge \"simpleperf: fix mac build.\"
am:
898b3f48e2
Change-Id: I92ea3c4aea4ec7426770a49c313223b52fd2d807
Yabin Cui [Tue, 14 Jun 2016 01:40:35 +0000 (01:40 +0000)]
Merge "simpleperf: fix mac build."
Yabin Cui [Tue, 14 Jun 2016 01:24:17 +0000 (01:24 +0000)]
Merge \\"simpleperf: support report samples using format defined by protobuf.\\" am:
9e02231f56
am:
78b15d0e54
Change-Id: I166ad49ea4081500f77567a2cf7ab1f2664a793c
Yabin Cui [Tue, 14 Jun 2016 01:14:39 +0000 (18:14 -0700)]
simpleperf: fix mac build.
Bug:
28114205
Change-Id: I84ad011b10c19e07576b718ba4b6b6c52a823366
Yabin Cui [Tue, 14 Jun 2016 00:25:17 +0000 (00:25 +0000)]
Merge \"simpleperf: support report samples using format defined by protobuf.\"
am:
9e02231f56
Change-Id: I6d7fd1959484c588ace7b8753c8d7c67d691773e
Yabin Cui [Tue, 14 Jun 2016 00:16:34 +0000 (00:16 +0000)]
Merge "simpleperf: support report samples using format defined by protobuf."
Yabin Cui [Fri, 3 Jun 2016 22:06:53 +0000 (15:06 -0700)]
simpleperf: support report samples using format defined by protobuf.
Bug:
28114205
Change-Id: Idf6d64b8418b3d55d5a43f6096dd2d69764692c0
Sami Tolvanen [Mon, 13 Jun 2016 15:20:18 +0000 (15:20 +0000)]
Merge \\"libfec: return raw and corrected verity metadata signatures\\" am:
964cae530c
am:
66c3086727
Change-Id: I8be1b4fbca0ce966aede30acd91fc9f88994e9de
Sami Tolvanen [Mon, 13 Jun 2016 15:12:21 +0000 (15:12 +0000)]
Merge \"libfec: return raw and corrected verity metadata signatures\"
am:
964cae530c
Change-Id: I5965e8f81c8f9813ce8cfe979283e9348f4e9ea7
Sami Tolvanen [Mon, 13 Jun 2016 15:04:16 +0000 (15:04 +0000)]
Merge "libfec: return raw and corrected verity metadata signatures"
Yabin Cui [Sat, 11 Jun 2016 04:02:12 +0000 (04:02 +0000)]
Merge \"simpleperf: restore perf_harden after simpleperf cts test.\" into nyc-dev
am:
4d9e9c66fb -s ours
Change-Id: I4b6cf1587671fba18b5bc5b45d8f0352c436a75c
Yabin Cui [Sat, 11 Jun 2016 03:53:11 +0000 (03:53 +0000)]
Merge "simpleperf: restore perf_harden after simpleperf cts test." into nyc-dev
Yabin Cui [Sat, 11 Jun 2016 02:04:09 +0000 (02:04 +0000)]
simpleperf: check perf event limit.
am:
92c688b1f7 -s ours
Change-Id: Ic442205bbf8ba021f257f9cfcf46ed3ca30a7482
Yabin Cui [Fri, 10 Jun 2016 19:15:11 +0000 (12:15 -0700)]
simpleperf: restore perf_harden after simpleperf cts test.
Bug:
29264324
Change-Id: Ia78ef924f049630968d222729cf3c1f378105b8a
(cherry picked from commit
5896132e00c7e49d2468d7ebd5372654df29b872)
Yabin Cui [Sat, 11 Jun 2016 00:45:19 +0000 (00:45 +0000)]
Merge \\"simpleperf: restore perf_harden after simpleperf cts test.\\" am:
33732ddfd3
am:
9e3191452e
Change-Id: I614cb8a32c44143e6c7630b1687c82fd1c9a8c5b
Yabin Cui [Sat, 11 Jun 2016 00:41:22 +0000 (00:41 +0000)]
Merge \"simpleperf: restore perf_harden after simpleperf cts test.\"
am:
33732ddfd3
Change-Id: Ibf4c201724d5254fed1db18e49ae8b1ccc6f05d3
Yabin Cui [Sat, 11 Jun 2016 00:30:03 +0000 (00:30 +0000)]
Merge "simpleperf: restore perf_harden after simpleperf cts test."
Yabin Cui [Wed, 1 Jun 2016 22:39:39 +0000 (15:39 -0700)]
simpleperf: check perf event limit.
The property security.perf_harden is added in https://android-review.googlesource.com/#/c/233736/5. And simpleperf needs to notice that.
Bug:
29054680
Change-Id: I5f1593f5b389d182a56c4bf3bd438a1dc2b66686
(cherry picked from commit
ebf79f3a65c81ef0f8cd7a3b875771be88157fcc)
Yabin Cui [Fri, 10 Jun 2016 19:15:11 +0000 (12:15 -0700)]
simpleperf: restore perf_harden after simpleperf cts test.
Bug:
29264324
Change-Id: Ia78ef924f049630968d222729cf3c1f378105b8a
Than McIntosh [Fri, 10 Jun 2016 11:09:18 +0000 (11:09 +0000)]
Merge \\"Support for converting callchain profiles.\\" am:
05c98248e6
am:
342b992f85
Change-Id: I1d1f18dc1aa21f830bde03ec45ef121f94f0c5bf
Than McIntosh [Fri, 10 Jun 2016 11:06:34 +0000 (11:06 +0000)]
Merge \"Support for converting callchain profiles.\"
am:
05c98248e6
Change-Id: Ic217bbf8f52b1068e6778a56dea5e8a875305abd
Than McIntosh [Fri, 10 Jun 2016 11:02:40 +0000 (11:02 +0000)]
Merge "Support for converting callchain profiles."
Tao Bao [Fri, 10 Jun 2016 05:40:05 +0000 (22:40 -0700)]
boot_control_copy: Track the the bootloader_message struct change.
Bug:
29193360
Change-Id: I518e786eb2d45b6a71c25dc4402e3bbebef20dc6
Alex Deymo [Fri, 10 Jun 2016 04:02:20 +0000 (04:02 +0000)]
Merge \\"postinst: Update comment to match implementation example.\\" am:
47600b7efd
am:
fa31c2c899
Change-Id: I96d62f4a8b607cba5fd6a763fd77e7a46f1dc547
Alex Deymo [Fri, 10 Jun 2016 03:59:36 +0000 (03:59 +0000)]
Merge \"postinst: Update comment to match implementation example.\"
am:
47600b7efd
Change-Id: I0ff2b20b3de03e08e3784e565d05e747718d34a3
Treehugger Robot [Fri, 10 Jun 2016 03:50:12 +0000 (03:50 +0000)]
Merge "postinst: Update comment to match implementation example."
Alex Deymo [Fri, 10 Jun 2016 01:09:43 +0000 (18:09 -0700)]
postinst: Update comment to match implementation example.
"set_progress" should be "global_progress" in the documentation as the
example shows.
Bug:
29223204
TEST=None
Change-Id: I01b2abb2ba500941e591515217533150ef05dd97
Sami Tolvanen [Fri, 3 Jun 2016 20:56:07 +0000 (13:56 -0700)]
libfec: return raw and corrected verity metadata signatures
Since it's not possible for libfec to identify whether the signature
field was successfully corrected, return both and allow the caller to
validate either signature.
Bug:
28943429
Change-Id: Ie913c21ba1d07d6df4c6feeb7226b2ec963f4d19
(cherry picked from commit
65cbaeb020b209f3d75d594ebbe49a609dd3c7e7)
Erik Kline [Tue, 7 Jun 2016 04:03:13 +0000 (04:03 +0000)]
Do not build multinetwork tools when targeting the PDK
am:
600c6341e6
* commit '
600c6341e62c165c60f526174d965cc7f1b30c38':
Do not build multinetwork tools when targeting the PDK
Change-Id: If2fcc9f0326ce63248b1845f26546baa894fcccd
Erik Kline [Mon, 6 Jun 2016 21:57:12 +0000 (06:57 +0900)]
Do not build multinetwork tools when targeting the PDK
Bug:
29071416
Change-Id: Ie39cad3151907aabbf523895d6cde37b82ff29a2
Sami Tolvanen [Tue, 7 Jun 2016 00:47:07 +0000 (17:47 -0700)]
resolve merge conflicts of
65cbaeb to nyc-dev-plus-aosp
Change-Id: I577f36d8f4588866606ef4b3f4b88d5af3505fbf
Sami Tolvanen [Fri, 3 Jun 2016 20:56:07 +0000 (13:56 -0700)]
libfec: return raw and corrected verity metadata signatures
Since it's not possible for libfec to identify whether the signature
field was successfully corrected, return both and allow the caller to
validate either signature.
Bug:
28943429
Change-Id: Ie913c21ba1d07d6df4c6feeb7226b2ec963f4d19
Yabin Cui [Fri, 3 Jun 2016 23:40:10 +0000 (23:40 +0000)]
Merge "simpleperf: dump tracing data when needed." am:
86bebf8ff0
am:
38ed5b4c0c
* commit '
38ed5b4c0c4071c994bdccc5430eead4e3d47548':
simpleperf: dump tracing data when needed.
Change-Id: I60403f2546c52caaedc25f670ea03d24cee75e5b
Yabin Cui [Fri, 3 Jun 2016 23:32:30 +0000 (23:32 +0000)]
Merge "simpleperf: dump tracing data when needed."
am:
86bebf8ff0
* commit '
86bebf8ff08a2573ad505b93376b7fb15a3b1a56':
simpleperf: dump tracing data when needed.
Change-Id: Ie420f316db839d60e09089a490b75a6e9093add6
Treehugger Robot [Fri, 3 Jun 2016 23:26:14 +0000 (23:26 +0000)]
Merge "simpleperf: dump tracing data when needed."