OSDN Git Service

android-x86/system-extras.git
8 years agoMerge \\\\"Simpleperf: adjust default mmap_pages for system wide profiling.\\\\"...
Yabin Cui [Wed, 22 Jun 2016 21:46:31 +0000 (21:46 +0000)]
Merge \\\\"Simpleperf: adjust default mmap_pages for system wide profiling.\\\\" am: b2fae142fb am: 7d8c686f23 am: 2f7b8790bd
am: e3e664d098

Change-Id: Ic3a2103232f69d12b77abd37cc2440fee3a454e8

8 years agoMerge \\\\"Simpleperf: check if -f option for record command is in valid range.\...
Yabin Cui [Wed, 22 Jun 2016 21:46:30 +0000 (21:46 +0000)]
Merge \\\\"Simpleperf: check if -f option for record command is in valid range.\\\\" am: d954410cc5 am: 6f63f7c869 am: c86c5e3125
am: 94c92f7140

Change-Id: I95f01e6e3f1ea1d80cc342ed58baedbbcfea7888

8 years agoMerge \\\\"Simpleperf: check root privilege for system wide profiling.\\\\" am: a961e...
Yabin Cui [Wed, 22 Jun 2016 21:46:30 +0000 (21:46 +0000)]
Merge \\\\"Simpleperf: check root privilege for system wide profiling.\\\\" am: a961ee585d am: 91d9d854ab am: 0192e3df77
am: b1b324ffa1

Change-Id: Id54db0acee38a985078e90a90c02e13a40ccfc65

8 years agoMerge \\\"Simpleperf: adjust default mmap_pages for system wide profiling.\\\" am...
Yabin Cui [Wed, 22 Jun 2016 21:31:11 +0000 (21:31 +0000)]
Merge \\\"Simpleperf: adjust default mmap_pages for system wide profiling.\\\" am: b2fae142fb am: 7d8c686f23
am: 2f7b8790bd

Change-Id: I08d248ea03cab21313dc5ab0c60cd5d5ede0bc0f

8 years agoMerge \\\"Simpleperf: check if -f option for record command is in valid range.\\...
Yabin Cui [Wed, 22 Jun 2016 21:31:11 +0000 (21:31 +0000)]
Merge \\\"Simpleperf: check if -f option for record command is in valid range.\\\" am: d954410cc5 am: 6f63f7c869
am: c86c5e3125

Change-Id: I3f6abae8f1f25b23fa47ff02a4ee5f8fb9396bf3

8 years agoMerge \\\"Simpleperf: check root privilege for system wide profiling.\\\" am: a961ee5...
Yabin Cui [Wed, 22 Jun 2016 21:31:10 +0000 (21:31 +0000)]
Merge \\\"Simpleperf: check root privilege for system wide profiling.\\\" am: a961ee585d am: 91d9d854ab
am: 0192e3df77

Change-Id: Ic2b89e00e0efb8705b56027516d2c07983da1c43

8 years agoMerge \\"Simpleperf: adjust default mmap_pages for system wide profiling.\\" am:...
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

8 years agoMerge \\"Simpleperf: check if -f option for record command is in valid range.\\"...
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

8 years agoMerge \\"Simpleperf: check root privilege for system wide profiling.\\" am: a961ee585d
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

8 years agoMerge \"Simpleperf: adjust default mmap_pages for system wide profiling.\"
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

8 years agoMerge \"Simpleperf: check if -f option for record command is in valid range.\"
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

8 years agoMerge \"Simpleperf: check root privilege for system wide profiling.\"
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

8 years agoMerge "Simpleperf: adjust default mmap_pages for system wide profiling."
Yabin Cui [Wed, 22 Jun 2016 21:19:54 +0000 (21:19 +0000)]
Merge "Simpleperf: adjust default mmap_pages for system wide profiling."

8 years agoMerge "Simpleperf: check if -f option for record command is in valid range."
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."

8 years agoMerge "Simpleperf: check root privilege for system wide profiling."
Yabin Cui [Wed, 22 Jun 2016 21:19:25 +0000 (21:19 +0000)]
Merge "Simpleperf: check root privilege for system wide profiling."

8 years agoSimpleperf: check if -f option for record command is in valid range.
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.

8 years agoSimpleperf: check root privilege for system wide profiling.
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.

8 years agoSimpleperf: adjust default mmap_pages for system wide profiling.
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.

8 years agoMerge \\\\"simpleperf: add kmem command to report slab allocation information.\\...
Yabin Cui [Tue, 21 Jun 2016 17:39:04 +0000 (17:39 +0000)]
Merge \\\\"simpleperf: add kmem command to report slab allocation information.\\\\" am: cee718a1c6 am: 1c05fae8ef am: 06910d7f78
am: d6d5e6ec48

Change-Id: Icd660f3800a097b4ddb759497a500a355e574d34

8 years agoMerge \\\"simpleperf: add kmem command to report slab allocation information.\\\...
Yabin Cui [Tue, 21 Jun 2016 17:34:26 +0000 (17:34 +0000)]
Merge \\\"simpleperf: add kmem command to report slab allocation information.\\\" am: cee718a1c6 am: 1c05fae8ef
am: 06910d7f78

Change-Id: Id9cccd7f5ae2f8627ebf4a92519538f5eff301b2

8 years agoMerge \\"simpleperf: add kmem command to report slab allocation information.\\" am...
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

8 years agoMerge \"simpleperf: add kmem command to report slab allocation information.\"
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

8 years agoMerge "simpleperf: add kmem command to report slab allocation information."
Yabin Cui [Tue, 21 Jun 2016 17:03:06 +0000 (17:03 +0000)]
Merge "simpleperf: add kmem command to report slab allocation information."

8 years agosimpleperf: 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

8 years agoMerge \\\\"simpleperf: support event group.\\\\" am: d5822b9d35 am: 733e4d06fb am...
Yabin Cui [Sat, 18 Jun 2016 01:19:00 +0000 (01:19 +0000)]
Merge \\\\"simpleperf: support event group.\\\\" am: d5822b9d35 am: 733e4d06fb am: 50a9b9c8a1
am: ba71d660d3

Change-Id: I9a54b77870b7909a7afb89cfd6ad953f3cad03a8

8 years agoMerge \\\"simpleperf: support event group.\\\" am: d5822b9d35 am: 733e4d06fb
Yabin Cui [Sat, 18 Jun 2016 01:11:09 +0000 (01:11 +0000)]
Merge \\\"simpleperf: support event group.\\\" am: d5822b9d35 am: 733e4d06fb
am: 50a9b9c8a1

Change-Id: I923e8518b4bded3df558aa6fe664c97eaa46c92c

8 years agoMerge \\"simpleperf: support event group.\\" am: d5822b9d35
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

8 years agoMerge \"simpleperf: support event group.\"
Yabin Cui [Sat, 18 Jun 2016 01:05:53 +0000 (01:05 +0000)]
Merge \"simpleperf: support event group.\"
am: d5822b9d35

Change-Id: Ia604d089f8cda23e26f86c66113fa1a2d3e75de2

8 years agoMerge "simpleperf: support event group."
Yabin Cui [Sat, 18 Jun 2016 00:58:28 +0000 (00:58 +0000)]
Merge "simpleperf: support event group."

8 years agosimpleperf: 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

8 years agoMerge \\\\"libfec: pack the fec_header structure\\\\" am: c2174a1934 am: bf504f017e...
Badhri Jagan Sridharan [Fri, 17 Jun 2016 19:06:20 +0000 (19:06 +0000)]
Merge \\\\"libfec: pack the fec_header structure\\\\" am: c2174a1934 am: bf504f017e am: bc8a479c94
am: 9deb8e85be

Change-Id: I481225a6f5aeccfe0bde3a8d482d35422bb1a253

8 years agoMerge \\\"libfec: pack the fec_header structure\\\" am: c2174a1934 am: bf504f017e
Jeremy Compostella [Fri, 17 Jun 2016 03:08:19 +0000 (03:08 +0000)]
Merge \\\"libfec: pack the fec_header structure\\\" am: c2174a1934 am: bf504f017e
am: bc8a479c94

Change-Id: Ibe370c9fe1325406835e0173c7864a4716a462c7

8 years agoMerge \\"libfec: pack the fec_header structure\\" am: c2174a1934
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

8 years agoMerge \"libfec: pack the fec_header structure\"
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

8 years agoMerge "libfec: pack the fec_header structure"
Badhri Jagan Sridharan [Fri, 17 Jun 2016 02:48:17 +0000 (02:48 +0000)]
Merge "libfec: pack the fec_header structure"

8 years agoMerge \\\"mksquashfsimage.sh: Make disable-4k-align a paramter\\\" into nyc-dev am...
Mohamad Ayyash [Thu, 16 Jun 2016 20:36:40 +0000 (20:36 +0000)]
Merge \\\"mksquashfsimage.sh: Make disable-4k-align a paramter\\\" into nyc-dev am: 041bdd8e10 am: 6308a40ece
am: 4479a4a411

Change-Id: I349ae476513a47b49fe7671f4913e841d21b49c7

8 years agoresolve merge conflicts of 041bdd8 to nyc-mr1-dev am: 0c2c44bfac
Mohamad Ayyash [Thu, 16 Jun 2016 20:36:39 +0000 (20:36 +0000)]
resolve merge conflicts of 041bdd8 to nyc-mr1-dev am: 0c2c44bfac
am: c288353956

Change-Id: If780575ad5286a49fde7c36726ef0f08c309fd8f

8 years agoMerge \\"mksquashfsimage.sh: Make disable-4k-align a paramter\\" into nyc-dev am...
Mohamad Ayyash [Thu, 16 Jun 2016 20:33:11 +0000 (20:33 +0000)]
Merge \\"mksquashfsimage.sh: Make disable-4k-align a paramter\\" into nyc-dev am: 041bdd8e10
am: 6308a40ece

Change-Id: Iea538c79248e17a972583e84996db48cc4b2e9fd

8 years agoresolve merge conflicts of 041bdd8 to nyc-mr1-dev
Mohamad Ayyash [Thu, 16 Jun 2016 20:30:46 +0000 (20:30 +0000)]
resolve merge conflicts of 041bdd8 to nyc-mr1-dev
am: 0c2c44bfac

Change-Id: I99a82e8f10e0902a6d73bdc00ed01eb61f927962

8 years agoresolve merge conflicts of 041bdd8 to nyc-mr1-dev
Mohamad Ayyash [Thu, 16 Jun 2016 20:17:32 +0000 (13:17 -0700)]
resolve merge conflicts of 041bdd8 to nyc-mr1-dev

Change-Id: I8b9b227f8afedb1eb77de8be9de689e3c621003e

8 years agoMerge \\"libfec: pack the fec_header structure\\" into nyc-mr1-dev am: 5ac3592d7f
Thierry Strudel [Thu, 16 Jun 2016 19:28:51 +0000 (19:28 +0000)]
Merge \\"libfec: pack the fec_header structure\\" into nyc-mr1-dev am: 5ac3592d7f
am: 9716a122f6

Change-Id: I3d499b1877fe0a5dca24dbab4531be19e64e47df

8 years agoMerge \"libfec: pack the fec_header structure\" into nyc-mr1-dev
Jeremy Compostella [Thu, 16 Jun 2016 19:20:20 +0000 (19:20 +0000)]
Merge \"libfec: pack the fec_header structure\" into nyc-mr1-dev
am: 5ac3592d7f

Change-Id: Ia63d90ee113be85b4f987a162f0da73b669813a4

8 years agoMerge "libfec: pack the fec_header structure" into nyc-mr1-dev
Thierry Strudel [Thu, 16 Jun 2016 19:15:40 +0000 (19:15 +0000)]
Merge "libfec: pack the fec_header structure" into nyc-mr1-dev

8 years agolibfec: pack the fec_header structure
Jeremy Compostella [Tue, 10 May 2016 09:53:06 +0000 (11:53 +0200)]
libfec: pack the fec_header structure

The fec_header structure is generated build time and stored on disk.
The fec_header might be build on a 64 bits machine while it is read
per a 32 bits device or the other way around.  In such situations, the
fec_header fields are not aligned as expected by the device and it
fails to read the fec_header structure.

This patch makes the fec_header packed.

Change-Id: I77546f850cea5559909971a1192e1a7616d22d50
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
8 years agoMerge \"mksquashfsimage.sh: Make disable-4k-align a paramter\" into nyc-dev
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

8 years agoMerge "mksquashfsimage.sh: Make disable-4k-align a paramter" into nyc-dev
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

8 years agoMerge "Remove ancient wifi stress test"
Christopher Wiley [Thu, 16 Jun 2016 15:32:00 +0000 (15:32 +0000)]
Merge "Remove ancient wifi stress test"

8 years agoMerge \\\\"simpleperf: add type modifier when reporting events.\\\\" am: 90d56472a6...
Yabin Cui [Wed, 15 Jun 2016 23:38:11 +0000 (23:38 +0000)]
Merge \\\\"simpleperf: add type modifier when reporting events.\\\\" am: 90d56472a6 am: fb768fd700 am: 1f3b56c62f
am: f2ca9092f3

Change-Id: Ifd97af48afbfaff329dc4cc2d613d018c0538efc

8 years agoMerge \\\"simpleperf: add type modifier when reporting events.\\\" am: 90d56472a6...
Yabin Cui [Wed, 15 Jun 2016 23:26:45 +0000 (23:26 +0000)]
Merge \\\"simpleperf: add type modifier when reporting events.\\\" am: 90d56472a6 am: fb768fd700
am: 1f3b56c62f

Change-Id: I8f72b4f2bbde8e70660e0088a7d874851f4f7004

8 years agoMerge \\\\"simpleperf: replace SIMPLEPERF_ALIGN macro with Align inline function...
Yabin Cui [Wed, 15 Jun 2016 23:26:38 +0000 (23:26 +0000)]
Merge \\\\"simpleperf: replace SIMPLEPERF_ALIGN macro with Align inline function.\\\\" am: 82cc1bf01d am: bf66399909 am: f3886d352f
am: 43c0c9937e

Change-Id: Ib9c06c7af7e33238d6422cb4b687f4abe857d8bd

8 years agoMerge \\"simpleperf: add type modifier when reporting events.\\" am: 90d56472a6
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

8 years agoMerge \"simpleperf: add type modifier when reporting events.\"
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

8 years agomksquashfsimage.sh: Make disable-4k-align a paramter
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>
8 years agoMerge "simpleperf: add type modifier when reporting events."
Yabin Cui [Wed, 15 Jun 2016 22:50:12 +0000 (22:50 +0000)]
Merge "simpleperf: add type modifier when reporting events."

8 years agoMerge \\\"simpleperf: replace SIMPLEPERF_ALIGN macro with Align inline function....
Yabin Cui [Wed, 15 Jun 2016 22:33:14 +0000 (22:33 +0000)]
Merge \\\"simpleperf: replace SIMPLEPERF_ALIGN macro with Align inline function.\\\" am: 82cc1bf01d am: bf66399909
am: f3886d352f

Change-Id: I9f5ff1667b1c38e8e09729ecf14182ad426c030d

8 years agoMerge \\"simpleperf: replace SIMPLEPERF_ALIGN macro with Align inline function.\...
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

8 years agoMerge \"simpleperf: replace SIMPLEPERF_ALIGN macro with Align inline function.\"
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

8 years agoMerge "simpleperf: replace SIMPLEPERF_ALIGN macro with Align inline function."
Yabin Cui [Wed, 15 Jun 2016 21:50:10 +0000 (21:50 +0000)]
Merge "simpleperf: replace SIMPLEPERF_ALIGN macro with Align inline function."

8 years agosimpleperf: add type modifier when reporting events.
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

8 years agosimpleperf: replace SIMPLEPERF_ALIGN macro with Align inline function.
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

8 years agoRemove ancient wifi stress test
Christopher Wiley [Wed, 15 Jun 2016 20:37:58 +0000 (13:37 -0700)]
Remove ancient wifi stress test

Bug: 29321445
Change-Id: Ib6797def04d69f20ea4e856d4005c57b5ec6ac42

8 years agoMerge changes from topic \\\'squashfs_ota_incrementals\\\' into nyc-dev am: 7354c0e18...
Mohamad Ayyash [Wed, 15 Jun 2016 17:35:55 +0000 (17:35 +0000)]
Merge changes from topic \\\'squashfs_ota_incrementals\\\' into nyc-dev am: 7354c0e18b am: 67873bad91
am: 294cda75c6

Change-Id: I3b6420ee322deff3a7caf5a2346452e1964d7a9f

8 years agoresolve merge conflicts of 7354c0e to nyc-mr1-dev am: c8966476a1
Mohamad Ayyash [Wed, 15 Jun 2016 17:35:54 +0000 (17:35 +0000)]
resolve merge conflicts of 7354c0e to nyc-mr1-dev am: c8966476a1
am: 1e90db6e81

Change-Id: I81897da4c135708ee051d52f61374e50bce1a137

8 years agoMerge changes from topic \\'squashfs_ota_incrementals\\' into nyc-dev am: 7354c0e18b
Mohamad Ayyash [Wed, 15 Jun 2016 17:02:47 +0000 (17:02 +0000)]
Merge changes from topic \\'squashfs_ota_incrementals\\' into nyc-dev am: 7354c0e18b
am: 67873bad91

Change-Id: I884b5511d21bfa260444f3c6c32b9f655963a068

8 years agoresolve merge conflicts of 7354c0e to nyc-mr1-dev
Mohamad Ayyash [Wed, 15 Jun 2016 17:02:21 +0000 (17:02 +0000)]
resolve merge conflicts of 7354c0e to nyc-mr1-dev
am: c8966476a1

Change-Id: Ief87c0cb7ff6fc0803b04ad69712068a4a186041

8 years agoresolve merge conflicts of 7354c0e to nyc-mr1-dev
Mohamad Ayyash [Wed, 15 Jun 2016 16:38:04 +0000 (09:38 -0700)]
resolve merge conflicts of 7354c0e to nyc-mr1-dev

Change-Id: I19693f5459794b71decfae4507fb2742c74f7c41

8 years agoMerge changes from topic \'squashfs_ota_incrementals\' into nyc-dev
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

8 years agoMerge changes from topic 'squashfs_ota_incrementals' into nyc-dev
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

8 years agoMerge \\\\"boot_control_copy: Track the the bootloader_message struct change.\\\...
Tao Bao [Tue, 14 Jun 2016 16:32:25 +0000 (16:32 +0000)]
Merge \\\\"boot_control_copy: Track the the bootloader_message struct change.\\\\" am: 42ca0e1992 am: 713a9a5c19 am: 22da4e5214
am: 52c6c48dbc

Change-Id: Id3912ad0b950efb632734b5cedb16d1bbc9fe4e8

8 years agoMerge \\\"boot_control_copy: Track the the bootloader_message struct change.\\\"...
Tao Bao [Tue, 14 Jun 2016 16:27:39 +0000 (16:27 +0000)]
Merge \\\"boot_control_copy: Track the the bootloader_message struct change.\\\" am: 42ca0e1992 am: 713a9a5c19
am: 22da4e5214

Change-Id: I5cbf51a14a7c8560d108a371f71167bda753f03e

8 years agoMerge \\"boot_control_copy: Track the the bootloader_message struct change.\\" am...
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

8 years agoMerge \"boot_control_copy: Track the the bootloader_message struct change.\"
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

8 years agoMerge "boot_control_copy: Track the the bootloader_message struct change."
Tao Bao [Tue, 14 Jun 2016 16:09:16 +0000 (16:09 +0000)]
Merge "boot_control_copy: Track the the bootloader_message struct change."

8 years agoDisable fragments and duplicates detection for squashfs
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>
8 years agomksquashfsimage.sh: Add support for passing block map files
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>
8 years agoMerge \\\\"simpleperf: fix mac build.\\\\" am: 898b3f48e2 am: ab0531d484 am: f0925fb6a4
Yabin Cui [Tue, 14 Jun 2016 02:02:31 +0000 (02:02 +0000)]
Merge \\\\"simpleperf: fix mac build.\\\\" am: 898b3f48e2 am: ab0531d484 am: f0925fb6a4
am: fca5aed03f

Change-Id: I597c3b20b31c2d677473378b0e6d4438f73b2d39

8 years agoMerge \\\"simpleperf: fix mac build.\\\" am: 898b3f48e2 am: ab0531d484
Yabin Cui [Tue, 14 Jun 2016 01:57:33 +0000 (01:57 +0000)]
Merge \\\"simpleperf: fix mac build.\\\" am: 898b3f48e2 am: ab0531d484
am: f0925fb6a4

Change-Id: I3e4a59c41622e62e1f28f8643a6b998f71b9132e

8 years agoMerge \\"simpleperf: fix mac build.\\" am: 898b3f48e2
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

8 years agoMerge \"simpleperf: fix mac build.\"
Yabin Cui [Tue, 14 Jun 2016 01:47:48 +0000 (01:47 +0000)]
Merge \"simpleperf: fix mac build.\"
am: 898b3f48e2

Change-Id: I92ea3c4aea4ec7426770a49c313223b52fd2d807

8 years agoMerge "simpleperf: fix mac build."
Yabin Cui [Tue, 14 Jun 2016 01:40:35 +0000 (01:40 +0000)]
Merge "simpleperf: fix mac build."

8 years agoMerge \\\\"simpleperf: support report samples using format defined by protobuf.\...
Yabin Cui [Tue, 14 Jun 2016 01:34:15 +0000 (01:34 +0000)]
Merge \\\\"simpleperf: support report samples using format defined by protobuf.\\\\" am: 9e02231f56 am: 78b15d0e54 am: 922bec969f
am: 1330183baa

Change-Id: Ia5478ea576b2aacd99ca9c1ec4d0b6c5e4109775

8 years agoMerge \\\"simpleperf: support report samples using format defined by protobuf.\\...
Yabin Cui [Tue, 14 Jun 2016 01:29:53 +0000 (01:29 +0000)]
Merge \\\"simpleperf: support report samples using format defined by protobuf.\\\" am: 9e02231f56 am: 78b15d0e54
am: 922bec969f

Change-Id: Ic2cb8a0493ee9d7a617ce77ffe8197d916beb7cc

8 years agoMerge \\"simpleperf: support report samples using format defined by protobuf.\\"...
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

8 years agosimpleperf: fix mac build.
Yabin Cui [Tue, 14 Jun 2016 01:14:39 +0000 (18:14 -0700)]
simpleperf: fix mac build.

Bug: 28114205
Change-Id: I84ad011b10c19e07576b718ba4b6b6c52a823366

8 years agoMerge \"simpleperf: support report samples using format defined by protobuf.\"
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

8 years agoMerge "simpleperf: support report samples using format defined by protobuf."
Yabin Cui [Tue, 14 Jun 2016 00:16:34 +0000 (00:16 +0000)]
Merge "simpleperf: support report samples using format defined by protobuf."

8 years agosimpleperf: 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

8 years agoMerge \\\\"libfec: return raw and corrected verity metadata signatures\\\\" am: 964ca...
Sami Tolvanen [Mon, 13 Jun 2016 15:28:33 +0000 (15:28 +0000)]
Merge \\\\"libfec: return raw and corrected verity metadata signatures\\\\" am: 964cae530c am: 66c3086727 am: 18c04cbec1
am: 8d77221998

Change-Id: I106d0ee23f1a21b13701966c6919e9ba2b6cfdd3

8 years agoMerge \\\"libfec: return raw and corrected verity metadata signatures\\\" am: 964cae5...
Sami Tolvanen [Mon, 13 Jun 2016 15:24:32 +0000 (15:24 +0000)]
Merge \\\"libfec: return raw and corrected verity metadata signatures\\\" am: 964cae530c am: 66c3086727
am: 18c04cbec1

Change-Id: Ifec6b8f806536c5fedc14917de05b390c4c1e7db

8 years agoMerge \\"libfec: return raw and corrected verity metadata signatures\\" am: 964cae530c
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

8 years agoMerge \"libfec: return raw and corrected verity metadata signatures\"
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

8 years agoMerge "libfec: return raw and corrected verity metadata signatures"
Sami Tolvanen [Mon, 13 Jun 2016 15:04:16 +0000 (15:04 +0000)]
Merge "libfec: return raw and corrected verity metadata signatures"

8 years agoMerge \\\"simpleperf: restore perf_harden after simpleperf cts test.\\\" into nyc...
Yabin Cui [Sat, 11 Jun 2016 04:13:47 +0000 (04:13 +0000)]
Merge \\\"simpleperf: restore perf_harden after simpleperf cts test.\\\" into nyc-dev am: 4d9e9c66fb am: aabbbfde48
am: e4447ecf5f

Change-Id: I3e61a1ca8f72534276cc5946d3d1066efac57e3b

8 years agoMerge \\"simpleperf: restore perf_harden after simpleperf cts test.\\" into nyc-dev...
Yabin Cui [Sat, 11 Jun 2016 04:10:07 +0000 (04:10 +0000)]
Merge \\"simpleperf: restore perf_harden after simpleperf cts test.\\" into nyc-dev am: 4d9e9c66fb
am: aabbbfde48

Change-Id: I5649fc456c92a918fc92e36e007378dd6ca45abb

8 years agoMerge \\\"simpleperf: restore perf_harden after simpleperf cts test.\\\" into nyc...
Yabin Cui [Sat, 11 Jun 2016 04:10:03 +0000 (04:10 +0000)]
Merge \\\"simpleperf: restore perf_harden after simpleperf cts test.\\\" into nyc-dev am: 4d9e9c66fb  -s ours am: 2fd7432b78
am: 5c0668603d

Change-Id: I1e4c6f508b689df8ab6773e0601814707927ad48

8 years agoMerge \\"simpleperf: restore perf_harden after simpleperf cts test.\\" into nyc-dev...
Yabin Cui [Sat, 11 Jun 2016 04:05:58 +0000 (04:05 +0000)]
Merge \\"simpleperf: restore perf_harden after simpleperf cts test.\\" into nyc-dev am: 4d9e9c66fb  -s ours
am: 2fd7432b78

Change-Id: Ia1edc98fa397d731694e9e13d6f73430dbaf981c

8 years agoMerge \"simpleperf: restore perf_harden after simpleperf cts test.\" into nyc-dev
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

8 years agoMerge \"simpleperf: restore perf_harden after simpleperf cts test.\" into nyc-dev
Yabin Cui [Sat, 11 Jun 2016 03:58:28 +0000 (03:58 +0000)]
Merge \"simpleperf: restore perf_harden after simpleperf cts test.\" into nyc-dev
am: 4d9e9c66fb

Change-Id: I39119b7d227b946e294b40bfd6805d886d92fa8b

8 years agoMerge "simpleperf: restore perf_harden after simpleperf cts test." into nyc-dev
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

8 years agosimpleperf: check perf event limit. am: 92c688b1f7 -s ours am: 684913e3b5
Yabin Cui [Sat, 11 Jun 2016 02:11:59 +0000 (02:11 +0000)]
simpleperf: check perf event limit. am: 92c688b1f7  -s ours am: 684913e3b5
am: ae2e25d1a6

Change-Id: I0db85817928ef631b8081c947ea7d608b4bd5cb8