OSDN Git Service

android-x86/system-extras.git
6 years agoMerge "simpleperf: add test for recording cpu-clock." am: 9dc8dd6de2 am: 4f5d2f4357
Yabin Cui [Thu, 13 Jul 2017 01:37:41 +0000 (01:37 +0000)]
Merge "simpleperf: add test for recording cpu-clock." am: 9dc8dd6de2 am: 4f5d2f4357
am: 3e74919c11

Change-Id: Id3c2a2d54fbf9f8181dc6777846d64ea9edea8fd

6 years agoMerge "simpleperf: add test for recording cpu-clock." am: 9dc8dd6de2
Yabin Cui [Thu, 13 Jul 2017 01:35:10 +0000 (01:35 +0000)]
Merge "simpleperf: add test for recording cpu-clock." am: 9dc8dd6de2
am: 4f5d2f4357

Change-Id: Ifffef0768bfce6ae932f23d40c6d2c2bdb58d6c6

6 years agoMerge "simpleperf: add test for recording cpu-clock."
Yabin Cui [Thu, 13 Jul 2017 01:33:11 +0000 (01:33 +0000)]
Merge "simpleperf: add test for recording cpu-clock."
am: 9dc8dd6de2

Change-Id: I94a66720ceeeb0b95eca5eadb8fd529f5744d931

6 years agoMerge "simpleperf: add test for recording cpu-clock."
Treehugger Robot [Thu, 13 Jul 2017 01:30:30 +0000 (01:30 +0000)]
Merge "simpleperf: add test for recording cpu-clock."

6 years agoos-release.d: set the default version to four numbers.
Sen Jiang [Tue, 4 Apr 2017 20:24:56 +0000 (13:24 -0700)]
os-release.d: set the default version to four numbers.

We will report system_version and product_version separately to Omaha,
so revert back to using four numbers for version.

Test: cat $OUT/system/etc/os-release.d/system_version
Change-Id: Ife69a7a17d1a06cc9127540cb39f27ce4fd0c944
(cherry picked from commit d454042d764713ead2b87b78f4d2292d2d422d45)

6 years agoMerge "simpleperf: enforce support of dwarf based callgraph." am: 1564048fd3 am:...
Yabin Cui [Thu, 13 Jul 2017 00:51:08 +0000 (00:51 +0000)]
Merge "simpleperf: enforce support of dwarf based callgraph." am: 1564048fd3 am: 63d9e48597 am: aedec0dc79
am: c4eb610186

Change-Id: Ic4b01a66be4dfa3b2a2f35a74c5afa1ac313b194

6 years agoMerge "simpleperf: enforce support of dwarf based callgraph." am: 1564048fd3 am:...
Yabin Cui [Thu, 13 Jul 2017 00:49:05 +0000 (00:49 +0000)]
Merge "simpleperf: enforce support of dwarf based callgraph." am: 1564048fd3 am: 63d9e48597
am: aedec0dc79

Change-Id: I24c3bf2e65bcfaed42f41a73ad7fef075783594b

6 years agoInferno: A framegrapher based on simpleperf
Fabien Sanglard [Wed, 28 Jun 2017 20:18:52 +0000 (13:18 -0700)]
Inferno: A framegrapher based on simpleperf

Inferno generates flamegraph for an entire process in one click.
The HTML report is automatically opened in the machine browser.

To run it on surfaceflinger, start UIBench to generate load and:
 - ./inferno.sh (Linux/MacOS)
 - ./inferno.bat (Windows)

See report.html for a sample report.

Change-Id: I35a20fcfe4b385dbf45832bef0ff69b80a44e1d6

6 years agoMerge "simpleperf: enforce support of dwarf based callgraph." am: 1564048fd3
Yabin Cui [Thu, 13 Jul 2017 00:46:37 +0000 (00:46 +0000)]
Merge "simpleperf: enforce support of dwarf based callgraph." am: 1564048fd3
am: 63d9e48597

Change-Id: I281bc4465071c642bad981196ab993c5b61bbf4c

6 years agoMerge "simpleperf: enforce support of dwarf based callgraph."
Yabin Cui [Thu, 13 Jul 2017 00:44:42 +0000 (00:44 +0000)]
Merge "simpleperf: enforce support of dwarf based callgraph."
am: 1564048fd3

Change-Id: I8fea0476d4e95ba9fa807760f2cf7e61b82a4c40

6 years agoMerge "simpleperf: enforce support of dwarf based callgraph."
Yabin Cui [Thu, 13 Jul 2017 00:42:36 +0000 (00:42 +0000)]
Merge "simpleperf: enforce support of dwarf based callgraph."

6 years agosimpleperf: enforce support of dwarf based callgraph.
Yabin Cui [Wed, 12 Jul 2017 21:50:07 +0000 (14:50 -0700)]
simpleperf: enforce support of dwarf based callgraph.

If it is not supported by the kernel, it may be because
a kernel patch "perf: Fix arch_perf_out_copy_user default",
or a configuration HAVE_PERF_USER_STACK_DUMP is missing.

Bug: http://b/63634097
Test: run simpleperf_unit_tests.
Change-Id: I4d3b2de72925c3566bcb0ebe41872919b7312687

6 years agosimpleperf: add test for recording cpu-clock.
Yabin Cui [Wed, 12 Jul 2017 21:25:46 +0000 (14:25 -0700)]
simpleperf: add test for recording cpu-clock.

Bug: http://b/63135835
Test: run the test on marlin.
Change-Id: I5b51eaafb596dc7df886b59b5ea208ae9c2c739a

6 years agoAdd an option to explicitly specify blockdev.
Mohan Srinivasan [Wed, 12 Jul 2017 21:03:16 +0000 (14:03 -0700)]
Add an option to explicitly specify blockdev.

Add a -b option, that allows user to explicitly specify a blockdev
that we want to get stats out of. For example, this allows us to
specify the userdata partition (on which IOshark runs). Or in the rare
case where support for a new device has not been added yet, we can
still run IOshark on it by using this option.

Test: Run IOshark with the -b option passed in and verify that the
device stats reported match with /proc/diskstats.

Change-Id: Ic835697a6aae4484c95537e7d489a9c1fefc0110
Signed-off-by: Mohan Srinivasan <srmohan@google.com>
6 years agorelease-request-b6f2d5b3-a3d6-410f-b58f-c85ba8187177-for-git_oc-mr1-release-4173087...
android-build-team Robot [Wed, 12 Jul 2017 07:29:07 +0000 (07:29 +0000)]
release-request-b6f2d5b3-a3d6-410f-b58f-c85ba8187177-for-git_oc-mr1-release-4173087 snap-temp-L93200000081515229

Change-Id: Ie5d9dc97419aa8c2f7c36379e2e142768d16237d

6 years agoAdding ioblame. A tool for App IO profiling.
Mohan Srinivasan [Mon, 10 Jul 2017 18:54:19 +0000 (11:54 -0700)]
Adding ioblame. A tool for App IO profiling.

ioblame is a tool for profiling App IO workloads. See the README for
more details on ioblame and how to use it.

Change-Id: Id56f827c2a8b744e24e3b21b535a59bd458f3de4
Signed-off-by: Mohan Srinivasan <srmohan@google.com>
6 years agorelease-request-5ee66a34-3e58-4de0-ba73-1f49074ee497-for-git_oc-mr1-release-4169335...
android-build-team Robot [Tue, 11 Jul 2017 07:26:56 +0000 (07:26 +0000)]
release-request-5ee66a34-3e58-4de0-ba73-1f49074ee497-for-git_oc-mr1-release-4169335 snap-temp-L20600000081126177

Change-Id: I9c952bd5a3358dcd4b22a86454a3453576e2ab11

6 years agoAdd kernel.config tests to VTS
nickrose [Mon, 10 Jul 2017 19:08:07 +0000 (12:08 -0700)]
Add kernel.config tests to VTS
Follow-up on Change-Id: Id52ac1639447276171006c33bdfa7b4e6c874745
b/62423436.

Test: make vts
Change-Id: I16269c4b6ce9ea4b01a07f9e30771a97025f3bac

6 years agorelease-request-ccd04736-6e66-4825-a227-ecd69d8b5337-for-git_oc-mr1-release-4163697...
android-build-team Robot [Fri, 7 Jul 2017 22:07:54 +0000 (22:07 +0000)]
release-request-ccd04736-6e66-4825-a227-ecd69d8b5337-for-git_oc-mr1-release-4163697 snap-temp-L79500000080559163

Change-Id: Ic23f5a5c1c5532619577d5f81f7f0f9e8f048d26

6 years agoMerge "Additional setup and reduced file collision" into oc-dr1-dev am: b5aca0236f
Maggie White [Fri, 7 Jul 2017 18:45:26 +0000 (18:45 +0000)]
Merge "Additional setup and reduced file collision" into oc-dr1-dev am: b5aca0236f
am: 7cf1adb901

Change-Id: I1c6bc4b85bbcbb2893db1df499db9cb7dd51635e

6 years agoMerge "Additional setup and reduced file collision" into oc-dr1-dev
Maggie White [Fri, 7 Jul 2017 18:26:10 +0000 (18:26 +0000)]
Merge "Additional setup and reduced file collision" into oc-dr1-dev
am: b5aca0236f

Change-Id: I2b4a19920e567a690eeb79b2c8328bcd7191fdec

6 years agoMerge "Additional setup and reduced file collision" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 18:14:36 +0000 (18:14 +0000)]
Merge "Additional setup and reduced file collision" into oc-dr1-dev

6 years agoAdditional setup and reduced file collision
Maggie White [Thu, 6 Jul 2017 00:01:40 +0000 (17:01 -0700)]
Additional setup and reduced file collision

There's some additional setup needed to make sure the devices are all in
the same state, so I added instructions to the README.

I also changed the system_stats functions to use variables to store
string outputs instead of files to avoid collision when running multiple
instances of the script from the same directory.

Finally, I added cleanup at the end to remove the files created in the
process, and some general code cleanup throughout the script.

Bug: 62536649
Test: manual test on several devices
Change-Id: I843a1cefcf6bd11f28e513d735b3bf313442efd2

6 years agoext4.h: add EXT4_FEATURE_INCOMPAT_ENCRYPT
Eric Biggers [Mon, 15 May 2017 21:19:24 +0000 (14:19 -0700)]
ext4.h: add EXT4_FEATURE_INCOMPAT_ENCRYPT

fs_mgr needs to know the value of the encrypt feature flag (added to
ext4 in upstream kernel v4.1) so it can enable it.

Bug: 36231741
Change-Id: I7475ea8424fa5a2c4712634eada3095e938e97e3

6 years agoext4_sb.h: make feature flags in fs_info 32-bit
Eric Biggers [Thu, 6 Jul 2017 19:44:40 +0000 (12:44 -0700)]
ext4_sb.h: make feature flags in fs_info 32-bit

The feature flag fields in the ext4 superblock are 32-bit, so they
should be 32-bit in fs_info too.

Bug: 36231741
Change-Id: I719953ac389d1c7f503db0b669c2815c44807f9f

6 years agoMerge "Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am: 7f60c1a8af...
Jin Qian [Thu, 6 Jul 2017 17:05:29 +0000 (17:05 +0000)]
Merge "Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am: 7f60c1a8af" into oc-dr1-dev-plus-aosp
am: c6ac1de500  -s ours

Change-Id: I369339bcad1f3b7455d5f6b3295be74094e05906

6 years agoMerge "Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am: 7f60c1a8af...
Android Build Merger (Role) [Thu, 6 Jul 2017 16:15:43 +0000 (16:15 +0000)]
Merge "Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am: 7f60c1a8af am: 22dc5b2af3  -s ours"

6 years agoMerge "Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am: 7f60c1a8af...
Android Build Merger (Role) [Thu, 6 Jul 2017 16:15:38 +0000 (16:15 +0000)]
Merge "Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am: 7f60c1a8af am: 48ac112365  -s ours"

6 years agoMerge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am: 7f60c1a8af
Jin Qian [Thu, 6 Jul 2017 16:14:18 +0000 (16:14 +0000)]
Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am: 7f60c1a8af
am: 22dc5b2af3  -s ours

Change-Id: I9f0171d274404b7d138e700fb5043e98bb0aed48

6 years agoMerge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am: 7f60c1a8af
Jin Qian [Thu, 6 Jul 2017 16:14:08 +0000 (16:14 +0000)]
Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am: 7f60c1a8af
am: 48ac112365  -s ours

Change-Id: Ide8b4f037be3e7951d4987e93d0a8c355a3b6da9

6 years agoMerge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am: 7f60c1a8af
Jin Qian [Thu, 6 Jul 2017 16:12:09 +0000 (16:12 +0000)]
Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am: 7f60c1a8af
am: 48ac112365  -s ours

Change-Id: I6fc072a585767e28d92200cf7b1a5d4859c8fe6a

6 years agoMerge "Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am: 7f60c1a8af...
Android Build Merger (Role) [Thu, 6 Jul 2017 16:07:54 +0000 (16:07 +0000)]
Merge "Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am: 7f60c1a8af" into oc-dr1-dev-plus-aosp

6 years agoMerge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev
Jin Qian [Thu, 6 Jul 2017 16:06:47 +0000 (16:06 +0000)]
Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev
am: 7f60c1a8af

Change-Id: If208ee125530792171cc194a9995588cff2bd219

6 years agoMerge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev
Jin Qian [Thu, 6 Jul 2017 16:06:30 +0000 (16:06 +0000)]
Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev
am: 7f60c1a8af

Change-Id: I6be2a4583eae7d7ffa1246316309fc7743396b9c

6 years agoMerge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 14:24:05 +0000 (14:24 +0000)]
Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev

6 years agoMerge "Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am:...
Jin Qian [Wed, 5 Jul 2017 22:48:00 +0000 (22:48 +0000)]
Merge "Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am: ec913d2a15" into oc-dr1-dev-plus-aosp
am: 94e877e74e  -s ours

Change-Id: Id5620775d1bc3532ba3e5fc026dfc2ddf5928b01

6 years agoMerge "Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am:...
Android Build Merger (Role) [Wed, 5 Jul 2017 22:46:57 +0000 (22:46 +0000)]
Merge "Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am: ec913d2a15 am: df9b270886  -s ours"

6 years agoMerge "Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am:...
Android Build Merger (Role) [Wed, 5 Jul 2017 22:46:51 +0000 (22:46 +0000)]
Merge "Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am: ec913d2a15 am: df9b270886  -s ours"

6 years agoMerge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am: ec913d2a15
Jin Qian [Wed, 5 Jul 2017 22:46:01 +0000 (22:46 +0000)]
Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am: ec913d2a15
am: df9b270886  -s ours

Change-Id: I7f9cc3032a9c9f5f009fc50ace25f33e35c46269

6 years agoMerge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am: ec913d2a15
Jin Qian [Wed, 5 Jul 2017 22:45:55 +0000 (22:45 +0000)]
Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am: ec913d2a15
am: df9b270886  -s ours

Change-Id: Ie2a0a7495696e74c9af44c35e3759219c07d4de9

6 years agoMerge "Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am:...
Android Build Merger (Role) [Wed, 5 Jul 2017 22:45:12 +0000 (22:45 +0000)]
Merge "Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am: ec913d2a15 am: 345d22c94a  -s ours"

6 years agoMerge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am: ec913d2a15
Jin Qian [Wed, 5 Jul 2017 22:44:11 +0000 (22:44 +0000)]
Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am: ec913d2a15
am: 345d22c94a  -s ours

Change-Id: Ia235a14890d1538b32e2bef37ba29f1df0dbab1b

6 years agoMerge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am: ec913d2a15
Jin Qian [Wed, 5 Jul 2017 22:44:10 +0000 (22:44 +0000)]
Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am: ec913d2a15
am: 345d22c94a  -s ours

Change-Id: I3c0f8f4a7c0f614da34903addc680aa9a6839210

6 years agoMerge "Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am:...
Android Build Merger (Role) [Wed, 5 Jul 2017 22:41:55 +0000 (22:41 +0000)]
Merge "Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am: ec913d2a15" into oc-dr1-dev-plus-aosp

6 years agoMerge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev
Jin Qian [Wed, 5 Jul 2017 22:41:12 +0000 (22:41 +0000)]
Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev
am: ec913d2a15

Change-Id: I7329e6edcd6e5b3ff786d2f74587d254d8b05be0

6 years agoMerge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev
Jin Qian [Wed, 5 Jul 2017 22:40:53 +0000 (22:40 +0000)]
Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev
am: ec913d2a15

Change-Id: I15d803cc98a8d9010cabe342a45ca916fb625db7

6 years agoMerge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev
TreeHugger Robot [Wed, 5 Jul 2017 22:33:36 +0000 (22:33 +0000)]
Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev

6 years agorelease-request-fbba21d1-17b5-4752-9864-95770e5db190-for-git_oc-mr1-release-4144771...
android-build-team Robot [Thu, 29 Jun 2017 07:31:51 +0000 (07:31 +0000)]
release-request-fbba21d1-17b5-4752-9864-95770e5db190-for-git_oc-mr1-release-4144771 snap-temp-L10300000078657232

Change-Id: Ic2b7d18579f44a00956a40d9178275d07564929c

6 years agoMerge "kernel.config: check console-ramoops-0" am: 3cd4b5a765 am: 66a4b1bd79 am:...
Mark Salyzyn [Wed, 28 Jun 2017 14:34:03 +0000 (14:34 +0000)]
Merge "kernel.config: check console-ramoops-0" am: 3cd4b5a765 am: 66a4b1bd79 am: 12981e42a7
am: 6c3e1f1458

Change-Id: I2c090b52d7dee0a4933302aee262b033acbc758a

6 years agoMerge "kernel.config: check console-ramoops-0" am: 3cd4b5a765 am: 66a4b1bd79
Mark Salyzyn [Wed, 28 Jun 2017 14:29:33 +0000 (14:29 +0000)]
Merge "kernel.config: check console-ramoops-0" am: 3cd4b5a765 am: 66a4b1bd79
am: 12981e42a7

Change-Id: I0381e6e215a04dd6c4bd63e4a0ae3ddc38085e2b

6 years agoMerge "kernel.config: check console-ramoops-0" am: 3cd4b5a765
Mark Salyzyn [Wed, 28 Jun 2017 14:26:04 +0000 (14:26 +0000)]
Merge "kernel.config: check console-ramoops-0" am: 3cd4b5a765
am: 66a4b1bd79

Change-Id: I817d00383d64cf5f4a4562f66f330f0a95fe8e28

6 years agoMerge "kernel.config: check console-ramoops-0"
Mark Salyzyn [Wed, 28 Jun 2017 14:22:34 +0000 (14:22 +0000)]
Merge "kernel.config: check console-ramoops-0"
am: 3cd4b5a765

Change-Id: I6972df5357f71ffcda97cdcbacaba8aa4eb726e1

6 years agoMerge "kernel.config: check console-ramoops-0"
Treehugger Robot [Wed, 28 Jun 2017 14:19:03 +0000 (14:19 +0000)]
Merge "kernel.config: check console-ramoops-0"

6 years agorelease-request-1b0d6769-ebfa-4e2d-b128-039ac0dcd5c9-for-git_oc-mr1-release-4140700...
android-build-team Robot [Wed, 28 Jun 2017 07:28:12 +0000 (07:28 +0000)]
release-request-1b0d6769-ebfa-4e2d-b128-039ac0dcd5c9-for-git_oc-mr1-release-4140700 snap-temp-L81200000078275553

Change-Id: I41cd480f0fe3c5fbda9c148c5c8136fd89b14c02

6 years agoMerge "simpleperf: add demo for kotlin." am: d39db9b0f5 am: 1e391c4bad am: 46993f430c
Yabin Cui [Tue, 27 Jun 2017 21:38:30 +0000 (21:38 +0000)]
Merge "simpleperf: add demo for kotlin." am: d39db9b0f5 am: 1e391c4bad am: 46993f430c
am: 16009ee41f

Change-Id: I0612d5c20bc8f3e6527a362674d37fa2ffcb31d4

6 years agoMerge "simpleperf: add demo for kotlin." am: d39db9b0f5 am: 1e391c4bad
Yabin Cui [Tue, 27 Jun 2017 21:35:29 +0000 (21:35 +0000)]
Merge "simpleperf: add demo for kotlin." am: d39db9b0f5 am: 1e391c4bad
am: 46993f430c

Change-Id: Ic45829fdbe23c1c2edf38f1f79d85650ad8495c5

6 years agoMerge "simpleperf: add demo for kotlin." am: d39db9b0f5
Yabin Cui [Tue, 27 Jun 2017 21:32:00 +0000 (21:32 +0000)]
Merge "simpleperf: add demo for kotlin." am: d39db9b0f5
am: 1e391c4bad

Change-Id: I8d7df6cc72bd42078a44b9c823cf1de3ec5a38cf

6 years agoMerge "simpleperf: add demo for kotlin."
Yabin Cui [Tue, 27 Jun 2017 21:28:31 +0000 (21:28 +0000)]
Merge "simpleperf: add demo for kotlin."
am: d39db9b0f5

Change-Id: Ie469016cf1d336ac2c88a0522c7913aee8d26ec1

6 years agokernel.config: check console-ramoops-0
Mark Salyzyn [Tue, 27 Jun 2017 16:36:52 +0000 (09:36 -0700)]
kernel.config: check console-ramoops-0

On later kernels /sys/fs/pstore/console-ramoops becomes
/sys/fs/pstore/console-ramoops-0. One or the other is
present, but not both.

Test: none
Bug: 63058217
Change-Id: I4b54cfdd9f347735ccd2debd08a1baa167c9a24f

6 years agoMerge "simpleperf: add demo for kotlin."
Yabin Cui [Tue, 27 Jun 2017 21:20:39 +0000 (21:20 +0000)]
Merge "simpleperf: add demo for kotlin."

6 years agosimpleperf: add demo for kotlin.
Yabin Cui [Tue, 27 Jun 2017 01:40:36 +0000 (18:40 -0700)]
simpleperf: add demo for kotlin.

And fix annotate.py to include kotlin source code.

Bug: http://b/32834638
Test: profile the app on bullhead and marlin using scripts manually.
Change-Id: Ic812cd2f8db7d047ceac58e3f5ae6a3f19e1879f

6 years agorelease-request-6db00e04-e62d-4e43-807a-a9cc1185dcbb-for-git_oc-mr1-release-4136929...
android-build-team Robot [Tue, 27 Jun 2017 07:31:23 +0000 (07:31 +0000)]
release-request-6db00e04-e62d-4e43-807a-a9cc1185dcbb-for-git_oc-mr1-release-4136929 snap-temp-L91700000077883673

Change-Id: I2554e27fa9613e7851e4818274dc30de0a107968

6 years agoAdded setup commands and option to specify device am: 5d58ea1a22
Maggie White [Tue, 27 Jun 2017 01:18:22 +0000 (01:18 +0000)]
Added setup commands and option to specify device am: 5d58ea1a22
am: 7f2e49a58b

Change-Id: I60f97c31b669fe68ff22edd78779b0780103f3c7

6 years agoAdded setup commands and option to specify device
Maggie White [Tue, 27 Jun 2017 00:58:01 +0000 (00:58 +0000)]
Added setup commands and option to specify device
am: 5d58ea1a22

Change-Id: I6348882937564d22cc0d0df50fe6c32066e665d2

6 years agoext4_utils: copy mke2fs.conf to /etc
Jin Qian [Wed, 7 Jun 2017 18:32:16 +0000 (11:32 -0700)]
ext4_utils: copy mke2fs.conf to /etc

mke2fs tool reads /etc/mke2fs.conf for filesystem configurations

Bug: 35219933
Change-Id: I2af633ffd3b37f9f5ad287375ea40b212bf61a01
Merged-In: I2af633ffd3b37f9f5ad287375ea40b212bf61a01

6 years agoext4_utils: copy mke2fs.conf to recovery /etc
Jin Qian [Thu, 8 Jun 2017 00:52:27 +0000 (17:52 -0700)]
ext4_utils: copy mke2fs.conf to recovery /etc

Bug: 35219933
Change-Id: I9af35a32adde24d751e5b11f9efcf6eca252db74
Merged-In: I9af35a32adde24d751e5b11f9efcf6eca252db74

6 years agoMerge "use f2fs upstream host to generate image" am: 6a9444152f am: 7c17f07be9 am...
Jin Qian [Mon, 26 Jun 2017 19:40:23 +0000 (19:40 +0000)]
Merge "use f2fs upstream host to generate image" am: 6a9444152f am: 7c17f07be9 am: 0d864d3704
am: ddfeb74845  -s ours

Change-Id: I72a6598bbcc84bf1a6dd904f4a5cf19d5905dc12

6 years agoMerge "use f2fs upstream host to generate image" am: 6a9444152f am: 7c17f07be9
Jin Qian [Mon, 26 Jun 2017 19:34:49 +0000 (19:34 +0000)]
Merge "use f2fs upstream host to generate image" am: 6a9444152f am: 7c17f07be9
am: 0d864d3704

Change-Id: I77e49ee0558a31f2bdc314faa628231a8f95e870

6 years agoMerge "use f2fs upstream host to generate image" am: 6a9444152f
Jin Qian [Mon, 26 Jun 2017 19:29:24 +0000 (19:29 +0000)]
Merge "use f2fs upstream host to generate image" am: 6a9444152f
am: 7c17f07be9

Change-Id: I85a4c546c1091be681a3222ac50cfb98f314d0cb

6 years agoMerge "use f2fs upstream host to generate image"
Jin Qian [Mon, 26 Jun 2017 19:23:47 +0000 (19:23 +0000)]
Merge "use f2fs upstream host to generate image"
am: 6a9444152f

Change-Id: I74846499dfc5e9c7058571353b442e90fd0ac998

6 years agoMerge "use f2fs upstream host to generate image"
Jin Qian [Mon, 26 Jun 2017 19:07:49 +0000 (19:07 +0000)]
Merge "use f2fs upstream host to generate image"

6 years agoAdded setup commands and option to specify device
Maggie White [Thu, 22 Jun 2017 00:42:25 +0000 (17:42 -0700)]
Added setup commands and option to specify device

The script previously did not configure any framework settings for this
script, so I added commands to disable any features that could affect
the performance numbers like wifi, NFC, screen rotation. It also clears
notifications and starts the device on the home screen.

It's not possible prior to this commit to run the app-launcher on a
host with multiple devices attached to adb, so I added a '-s <serial
number' option that allows the user to specify a specific device based
on its serial number.

I also changed the spacing of the script to be all spaces instead of
mixed tabs and spaces.

Test: Manually ran script on a marlin device

Change-Id: I82c621fe280033c55ba38bfdf95836fd95f5ed58

6 years agouse f2fs upstream host to generate image
Yang Jin [Thu, 22 Jun 2017 18:20:51 +0000 (11:20 -0700)]
use f2fs upstream host to generate image

calls make_f2fs -S <size> <filename>

Test: ./mkf2fsuserimg.sh ~/android/userdata.img 2000000000
Bug: 62493641
Change-Id: I4d3631a631fbdfbfc680eeba5f2a1dde204cba25
Merged-In: I4d3631a631fbdfbfc680eeba5f2a1dde204cba25

6 years agorelease-request-7bfcab52-d1c0-4256-9d6b-5b5092bc78ca-for-git_oc-mr1-release-4133428...
android-build-team Robot [Sun, 25 Jun 2017 07:38:22 +0000 (07:38 +0000)]
release-request-7bfcab52-d1c0-4256-9d6b-5b5092bc78ca-for-git_oc-mr1-release-4133428 snap-temp-L95800000077479875

Change-Id: Iee5feb53ecde25fde409e0d3c2ebfb74e8fa51ae

6 years agoMerge "use f2fs upstream host to generate image"
TreeHugger Robot [Fri, 23 Jun 2017 23:54:38 +0000 (23:54 +0000)]
Merge "use f2fs upstream host to generate image"

6 years agoMerge "simpleperf: fix the way to pull perf.data on windows." am: 7c8b89acad am:...
Yabin Cui [Fri, 23 Jun 2017 21:56:47 +0000 (21:56 +0000)]
Merge "simpleperf: fix the way to pull perf.data on windows." am: 7c8b89acad am: cac9fc0914 am: 67937ab0d6
am: 8f573923b2

Change-Id: Ib4cf5808b5eaa1bc5595205fb0f0911cfb49ed7a

6 years agoMerge "simpleperf: fix the way to pull perf.data on windows." am: 7c8b89acad am:...
Yabin Cui [Fri, 23 Jun 2017 21:52:14 +0000 (21:52 +0000)]
Merge "simpleperf: fix the way to pull perf.data on windows." am: 7c8b89acad am: cac9fc0914
am: 67937ab0d6

Change-Id: I7fb9194a99603c17ffbc12a6319a4f826780fb69

6 years agoMerge "simpleperf: fix the way to pull perf.data on windows." am: 7c8b89acad
Yabin Cui [Fri, 23 Jun 2017 21:48:16 +0000 (21:48 +0000)]
Merge "simpleperf: fix the way to pull perf.data on windows." am: 7c8b89acad
am: cac9fc0914

Change-Id: I2fe3a27759180ee49de41fe24d00b7645e007790

6 years agoMerge "simpleperf: fix the way to pull perf.data on windows."
Yabin Cui [Fri, 23 Jun 2017 21:43:14 +0000 (21:43 +0000)]
Merge "simpleperf: fix the way to pull perf.data on windows."
am: 7c8b89acad

Change-Id: I0978ba64f16c964a8b3a54f892eefb11ce6d80ad

6 years agoMerge "simpleperf: fix the way to pull perf.data on windows."
Yabin Cui [Fri, 23 Jun 2017 21:38:34 +0000 (21:38 +0000)]
Merge "simpleperf: fix the way to pull perf.data on windows."

6 years agouse f2fs upstream host to generate image
Yang Jin [Thu, 22 Jun 2017 18:20:51 +0000 (11:20 -0700)]
use f2fs upstream host to generate image

calls make_f2fs -S <size> <filename>

Test: ./mkf2fsuserimg.sh ~/android/userdata.img 2000000000
Bug: 62493641
Change-Id: I4d3631a631fbdfbfc680eeba5f2a1dde204cba25

6 years agosimpleperf: fix the way to pull perf.data on windows.
Yabin Cui [Wed, 21 Jun 2017 22:57:31 +0000 (15:57 -0700)]
simpleperf: fix the way to pull perf.data on windows.

Bug: http://b/32834638
Test: run app_profiler.py on linux/darwin/windows.
Change-Id: Id932ad7d0a21598eae7d844e6c33c6e64df22c5a

6 years agoMerge "simpleperf: fix x86 register dump on x86_64." am: 5abacf3bcf am: 1815f49dee...
Yabin Cui [Thu, 22 Jun 2017 22:23:13 +0000 (22:23 +0000)]
Merge "simpleperf: fix x86 register dump on x86_64." am: 5abacf3bcf am: 1815f49dee am: 688e4dfc51
am: 1263620299

Change-Id: Ie050f1031c5587b989880c7cf6a6d3174581da7c

6 years agoMerge "simpleperf: fix x86 register dump on x86_64." am: 5abacf3bcf am: 1815f49dee
Yabin Cui [Thu, 22 Jun 2017 22:10:39 +0000 (22:10 +0000)]
Merge "simpleperf: fix x86 register dump on x86_64." am: 5abacf3bcf am: 1815f49dee
am: 688e4dfc51

Change-Id: If8d2ef858adf152d64e9d7ef685b74ecf8938fa4

6 years agoMerge "simpleperf: fix x86 register dump on x86_64." am: 5abacf3bcf
Yabin Cui [Thu, 22 Jun 2017 22:06:57 +0000 (22:06 +0000)]
Merge "simpleperf: fix x86 register dump on x86_64." am: 5abacf3bcf
am: 1815f49dee

Change-Id: Ic4eac31d6bde6001e6beb5664b28de25bce3c96c

6 years agoMerge "simpleperf: fix x86 register dump on x86_64."
Yabin Cui [Thu, 22 Jun 2017 22:02:57 +0000 (22:02 +0000)]
Merge "simpleperf: fix x86 register dump on x86_64."
am: 5abacf3bcf

Change-Id: I988fca28fd873575d6bfb2b542d91b5eecb29f7b

6 years agoMerge "simpleperf: fix x86 register dump on x86_64."
Yabin Cui [Thu, 22 Jun 2017 21:58:47 +0000 (21:58 +0000)]
Merge "simpleperf: fix x86 register dump on x86_64."

6 years agosimpleperf: fix x86 register dump on x86_64.
Yabin Cui [Thu, 22 Jun 2017 20:02:29 +0000 (13:02 -0700)]
simpleperf: fix x86 register dump on x86_64.

x86_64 linux kernel doesn't support dumping registers like DS.
If simpleperf32 requests dumping these registers, it will fail.
So don't request them to avoid failure.

Bug: None.
Test: run simpleperf32 manually on x86_64.
Change-Id: I220ce5378bad8f0c3c9deb2ef32128fd3262b96d

6 years agoMerge "simpleperf: Support Ctrl-C in app_profiler.py." am: 7941d1917b am: c1a5f290f6...
Yabin Cui [Thu, 22 Jun 2017 19:22:52 +0000 (19:22 +0000)]
Merge "simpleperf: Support Ctrl-C in app_profiler.py." am: 7941d1917b am: c1a5f290f6 am: 9820d0fdcb
am: bdf9ba3e86

Change-Id: Ia6b3b21cad6fe3651505d5f35dd0b18c3806130d

6 years agoMerge "simpleperf: Support Ctrl-C in app_profiler.py." am: 7941d1917b am: c1a5f290f6
Yabin Cui [Thu, 22 Jun 2017 19:19:22 +0000 (19:19 +0000)]
Merge "simpleperf: Support Ctrl-C in app_profiler.py." am: 7941d1917b am: c1a5f290f6
am: 9820d0fdcb

Change-Id: I174a7b0ca63cf259fa900aafd7bc03b2058a3f3b

6 years agoMerge "simpleperf: Support Ctrl-C in app_profiler.py." am: 7941d1917b
Yabin Cui [Thu, 22 Jun 2017 19:14:52 +0000 (19:14 +0000)]
Merge "simpleperf: Support Ctrl-C in app_profiler.py." am: 7941d1917b
am: c1a5f290f6

Change-Id: I2328a2844cccfe1db5db44a824374b44122d888f

6 years agoMerge "simpleperf: Support Ctrl-C in app_profiler.py."
Yabin Cui [Thu, 22 Jun 2017 19:10:29 +0000 (19:10 +0000)]
Merge "simpleperf: Support Ctrl-C in app_profiler.py."
am: 7941d1917b

Change-Id: If56fea0daa9fd9e3022dd19ad08b41e96c3e8b51

6 years agoMerge "simpleperf: Support Ctrl-C in app_profiler.py."
Yabin Cui [Thu, 22 Jun 2017 19:05:06 +0000 (19:05 +0000)]
Merge "simpleperf: Support Ctrl-C in app_profiler.py."

6 years agorelease-request-36fe639f-9404-4c33-86fb-47bc4ab2221f-for-git_oc-mr1-release-4124666...
android-build-team Robot [Thu, 22 Jun 2017 07:36:13 +0000 (07:36 +0000)]
release-request-36fe639f-9404-4c33-86fb-47bc4ab2221f-for-git_oc-mr1-release-4124666 snap-temp-L64200000076596327

Change-Id: I99037c5f345f6dfc4212487c27cd1c50f679b4c1

6 years agoMerge "simpleperf: fix importing tkinter in report.py." am: 1ad1e76f95 am: bd48c993ab...
Yabin Cui [Thu, 22 Jun 2017 03:00:01 +0000 (03:00 +0000)]
Merge "simpleperf: fix importing tkinter in report.py." am: 1ad1e76f95 am: bd48c993ab am: 300bbc8cbd
am: 281d68a682

Change-Id: I2bbfb1910a7bcbd4daea084461a93d30739686c4

6 years agoMerge "simpleperf: fix importing tkinter in report.py." am: 1ad1e76f95 am: bd48c993ab
Yabin Cui [Thu, 22 Jun 2017 02:57:28 +0000 (02:57 +0000)]
Merge "simpleperf: fix importing tkinter in report.py." am: 1ad1e76f95 am: bd48c993ab
am: 300bbc8cbd

Change-Id: Id2b12acaaec41ade521426f48798b54fac2af79f

6 years agoMerge "simpleperf: fix importing tkinter in report.py." am: 1ad1e76f95
Yabin Cui [Thu, 22 Jun 2017 02:53:33 +0000 (02:53 +0000)]
Merge "simpleperf: fix importing tkinter in report.py." am: 1ad1e76f95
am: bd48c993ab

Change-Id: I74ae4869b536c0b7c2829639ccbbeef323cef726

6 years agoMerge "simpleperf: fix importing tkinter in report.py."
Yabin Cui [Thu, 22 Jun 2017 02:49:59 +0000 (02:49 +0000)]
Merge "simpleperf: fix importing tkinter in report.py."
am: 1ad1e76f95

Change-Id: Ib85e9a59f94870e736511068975acb4bc9f704a9

6 years agoMerge "simpleperf: fix importing tkinter in report.py."
Yabin Cui [Thu, 22 Jun 2017 02:46:46 +0000 (02:46 +0000)]
Merge "simpleperf: fix importing tkinter in report.py."

6 years agosimpleperf: Support Ctrl-C in app_profiler.py.
Yabin Cui [Wed, 21 Jun 2017 19:19:36 +0000 (12:19 -0700)]
simpleperf: Support Ctrl-C in app_profiler.py.

Bug: http://b/32834638
Test: kill app_profiler.py with Ctrl-C manually.

Change-Id: I03b8813080b45e324c66ce3de27e5dd1f8849446