OSDN Git Service

android-x86/system-extras.git
7 years agoMerge "simpleperf: better support kernel symbols when running as root." am: fbc7062e9...
Yabin Cui [Mon, 22 May 2017 18:48:59 +0000 (18:48 +0000)]
Merge "simpleperf: better support kernel symbols when running as root." am: fbc7062e9b am: e9488b3fec am: 41ed89b979
am: 7b9a8f1ca9

Change-Id: I3733d58c2471250205653f775e7a6c8ea2c75f3e

7 years agoMerge "simpleperf: support [vdso]." am: b8b93042c9 am: 74e68c8097 am: 4d01701b65
Yabin Cui [Mon, 22 May 2017 18:48:45 +0000 (18:48 +0000)]
Merge "simpleperf: support [vdso]." am: b8b93042c9 am: 74e68c8097 am: 4d01701b65
am: 2b57f12338

Change-Id: Ibcbd42e92811bdedfb92f9babc2714e3cd7f8e6e

7 years agoMerge "simpleperf: better support kernel symbols when running as root." am: fbc7062e9...
Yabin Cui [Mon, 22 May 2017 18:37:58 +0000 (18:37 +0000)]
Merge "simpleperf: better support kernel symbols when running as root." am: fbc7062e9b am: e9488b3fec
am: 41ed89b979

Change-Id: I80c51cddc14f73a1cdc611bc1424623988007ba6

7 years agoMerge "simpleperf: support [vdso]." am: b8b93042c9 am: 74e68c8097
Yabin Cui [Mon, 22 May 2017 18:37:46 +0000 (18:37 +0000)]
Merge "simpleperf: support [vdso]." am: b8b93042c9 am: 74e68c8097
am: 4d01701b65

Change-Id: I1d136806dc2d43ef032e8bae676e3c2772d67443

7 years agoMerge "simpleperf: better support kernel symbols when running as root." am: fbc7062e9b
Yabin Cui [Mon, 22 May 2017 18:31:26 +0000 (18:31 +0000)]
Merge "simpleperf: better support kernel symbols when running as root." am: fbc7062e9b
am: e9488b3fec

Change-Id: I3328a1bfa0209b2ae39302e642051940795f70b0

7 years agoMerge "simpleperf: support [vdso]." am: b8b93042c9
Yabin Cui [Mon, 22 May 2017 18:31:13 +0000 (18:31 +0000)]
Merge "simpleperf: support [vdso]." am: b8b93042c9
am: 74e68c8097

Change-Id: I604d86de4b29e16e3b6a6ed6d4af25c059bddcce

7 years agoMerge "simpleperf: better support kernel symbols when running as root."
Yabin Cui [Mon, 22 May 2017 18:25:58 +0000 (18:25 +0000)]
Merge "simpleperf: better support kernel symbols when running as root."
am: fbc7062e9b

Change-Id: I6950f4a91a52632e5f3abe124fee88854ce5ddf5

7 years agoMerge "simpleperf: support [vdso]."
Yabin Cui [Mon, 22 May 2017 18:25:43 +0000 (18:25 +0000)]
Merge "simpleperf: support [vdso]."
am: b8b93042c9

Change-Id: I13f5dc890be5552638bb194b9752bbb1d1fc5a35

7 years agoMerge "simpleperf: better support kernel symbols when running as root."
Yabin Cui [Mon, 22 May 2017 18:16:21 +0000 (18:16 +0000)]
Merge "simpleperf: better support kernel symbols when running as root."

7 years agoMerge "simpleperf: support [vdso]."
Treehugger Robot [Mon, 22 May 2017 18:14:51 +0000 (18:14 +0000)]
Merge "simpleperf: support [vdso]."

7 years agosimpleperf: support [vdso].
Yabin Cui [Fri, 19 May 2017 19:57:44 +0000 (12:57 -0700)]
simpleperf: support [vdso].

Before this CL, there is no way to parse symbols from [vdso] or unwind
through it. In this CL, simpleperf dumps [vdso] segment in its own memory space
to local file system, so it can be used for getting symbols or unwinding.
It takes care that vdso files for 32bit version and 64bit version are not
misused.

Bug: None.
Test: run simpleperf_unit_test.
Test: run simpleperf on processes using vdso.

Change-Id: I9233daf1d07df262a4a0fcdeadd3e544f3ccc906

7 years agosimpleperf: better support kernel symbols when running as root.
Yabin Cui [Fri, 19 May 2017 19:02:15 +0000 (12:02 -0700)]
simpleperf: better support kernel symbols when running as root.

Instead of asking user to `echo 0 >/proc/sys/kernel/kptr_restrict`,
do it automatically in simpleperf.

Bug: None.
Test: run simpleperf as root.
Test: run simpleperf_unit_test.
Change-Id: If31aa03b6e30afb925cbf58835536ed4c969a635

7 years agoMerge "boot_control_copy should #include <sys/sysmacros.h>." am: 542c1b32fa am: 59727...
Elliott Hughes [Fri, 19 May 2017 19:00:54 +0000 (19:00 +0000)]
Merge "boot_control_copy should #include <sys/sysmacros.h>." am: 542c1b32fa am: 59727ff28e am: cc421ba741
am: bfc949fe4c

Change-Id: Ib8b9b5e576cf1fef231510d4dad09ea8cfb9b735

7 years agoMerge "boot_control_copy should #include <sys/sysmacros.h>." am: 542c1b32fa am: 59727...
Elliott Hughes [Fri, 19 May 2017 18:45:55 +0000 (18:45 +0000)]
Merge "boot_control_copy should #include <sys/sysmacros.h>." am: 542c1b32fa am: 59727ff28e
am: cc421ba741

Change-Id: Ieec33547b5ab7e8f5ac01d72a80477516bcce7d3

7 years agoMerge "boot_control_copy should #include <sys/sysmacros.h>." am: 542c1b32fa
Elliott Hughes [Fri, 19 May 2017 18:41:49 +0000 (18:41 +0000)]
Merge "boot_control_copy should #include <sys/sysmacros.h>." am: 542c1b32fa
am: 59727ff28e

Change-Id: I54c1f3020ba0c92a334966fcf52ccd92c395c329

7 years agoMerge "boot_control_copy should #include <sys/sysmacros.h>."
Elliott Hughes [Fri, 19 May 2017 18:38:19 +0000 (18:38 +0000)]
Merge "boot_control_copy should #include <sys/sysmacros.h>."
am: 542c1b32fa

Change-Id: I8952802f43c1fef0616de41f70050827cdcda053

7 years agoMerge "boot_control_copy should #include <sys/sysmacros.h>."
Treehugger Robot [Fri, 19 May 2017 18:30:59 +0000 (18:30 +0000)]
Merge "boot_control_copy should #include <sys/sysmacros.h>."

7 years agoMerge "simpleperf: enable two options by default." am: 7386d10cce am: 848d294253...
Yabin Cui [Fri, 19 May 2017 18:12:31 +0000 (18:12 +0000)]
Merge "simpleperf: enable two options by default." am: 7386d10cce am: 848d294253 am: d2f70f60c5
am: 753e534226

Change-Id: I2ab4432bf6bccf0f73b03ba3e1e3ca1cab0fd973

7 years agoMerge "simpleperf: enable two options by default." am: 7386d10cce am: 848d294253
Yabin Cui [Fri, 19 May 2017 18:11:03 +0000 (18:11 +0000)]
Merge "simpleperf: enable two options by default." am: 7386d10cce am: 848d294253
am: d2f70f60c5

Change-Id: I9cbf0eaacdc8bdffba43013028c5203a7c46e516

7 years agoMerge "simpleperf: enable two options by default." am: 7386d10cce
Yabin Cui [Fri, 19 May 2017 18:08:30 +0000 (18:08 +0000)]
Merge "simpleperf: enable two options by default." am: 7386d10cce
am: 848d294253

Change-Id: Ica2596c99204bcf7299f1eb431f37cbc3a0077b4

7 years agoMerge "simpleperf: enable two options by default."
Yabin Cui [Fri, 19 May 2017 18:06:59 +0000 (18:06 +0000)]
Merge "simpleperf: enable two options by default."
am: 7386d10cce

Change-Id: I110a2f29c49c4a9a56fcca639b8e6489e731df1c

7 years agoMerge "simpleperf: enable two options by default."
Treehugger Robot [Fri, 19 May 2017 17:58:43 +0000 (17:58 +0000)]
Merge "simpleperf: enable two options by default."

7 years agosimpleperf: enable two options by default.
Yabin Cui [Fri, 19 May 2017 00:11:32 +0000 (17:11 -0700)]
simpleperf: enable two options by default.

Enable dumping symbols in record cmd by default,
and change --dump-symbols option into --no-dump-symbols option.
Show brief call graph in report cmd by default,
and change --brief-callgraph option into --full-callgraph option.
Make the change because these two behaviors are always recommended.

Bug: None.
Test: run simpleperf_unit_test.
Change-Id: Icff6a843a7f46c56313500f4da119aa5118a57e5

7 years agoboot_control_copy should #include <sys/sysmacros.h>.
Elliott Hughes [Thu, 18 May 2017 16:02:43 +0000 (09:02 -0700)]
boot_control_copy should #include <sys/sysmacros.h>.

Bug: https://github.com/android-ndk/ndk/issues/398
Test: builds
Change-Id: Icfccc98e1ff5aaa53b288e2aba0efe2c2c77a623

7 years agoMerge "libf2fs_sparseblock: Android.mk->Android.bp" am: bc3f1c9f57 am: 1ac6a67db8...
Jayant Chowdhary [Tue, 16 May 2017 21:41:06 +0000 (21:41 +0000)]
Merge "libf2fs_sparseblock: Android.mk->Android.bp" am: bc3f1c9f57 am: 1ac6a67db8 am: 1aa597e1b5
am: 6b23f54ef4

Change-Id: Ibd083c33aed444c37a618bdb8fd684d97391ced8

7 years agoMerge "libf2fs_sparseblock: Android.mk->Android.bp" am: bc3f1c9f57 am: 1ac6a67db8
Jayant Chowdhary [Tue, 16 May 2017 21:01:00 +0000 (21:01 +0000)]
Merge "libf2fs_sparseblock: Android.mk->Android.bp" am: bc3f1c9f57 am: 1ac6a67db8
am: 1aa597e1b5

Change-Id: I924abf0690051b97ad28631199e7c446b7fc3a80

7 years agoMerge "libf2fs_sparseblock: Android.mk->Android.bp" am: bc3f1c9f57
Jayant Chowdhary [Tue, 16 May 2017 20:46:44 +0000 (20:46 +0000)]
Merge "libf2fs_sparseblock: Android.mk->Android.bp" am: bc3f1c9f57
am: 1ac6a67db8

Change-Id: Ic9991d84f66b1a38346b87dc6e25fb33a4ec5e9d

7 years agoMerge "libf2fs_sparseblock: Android.mk->Android.bp"
Jayant Chowdhary [Tue, 16 May 2017 20:35:54 +0000 (20:35 +0000)]
Merge "libf2fs_sparseblock: Android.mk->Android.bp"
am: bc3f1c9f57

Change-Id: I86e8c5b0f2da48f8f3801d1f429e9582b3b4f0f2

7 years agoMerge "libf2fs_sparseblock: Android.mk->Android.bp"
Treehugger Robot [Tue, 16 May 2017 20:19:03 +0000 (20:19 +0000)]
Merge "libf2fs_sparseblock: Android.mk->Android.bp"

7 years agoMerge "simpleperf: fix report_sample_test." am: 7b615cfb00 am: 8376ac2f2e am: 253c2ad631
Yabin Cui [Mon, 15 May 2017 22:50:46 +0000 (22:50 +0000)]
Merge "simpleperf: fix report_sample_test." am: 7b615cfb00 am: 8376ac2f2e am: 253c2ad631
am: 569382dd66

Change-Id: I216690062cfdfa7b79c3a5732123fec1609437a5

7 years agoMerge "simpleperf: fix report_sample_test." am: 7b615cfb00 am: 8376ac2f2e
Yabin Cui [Mon, 15 May 2017 22:40:27 +0000 (22:40 +0000)]
Merge "simpleperf: fix report_sample_test." am: 7b615cfb00 am: 8376ac2f2e
am: 253c2ad631

Change-Id: Id16a0bc23af2d336e5709ddc15c13a2e36dcf27a

7 years agoMerge "simpleperf: fix report_sample_test." am: 7b615cfb00
Yabin Cui [Mon, 15 May 2017 22:30:49 +0000 (22:30 +0000)]
Merge "simpleperf: fix report_sample_test." am: 7b615cfb00
am: 8376ac2f2e

Change-Id: I5507a4c0d85e27576c2746ddf855426d684274d6

7 years agoMerge "simpleperf: fix report_sample_test."
Yabin Cui [Mon, 15 May 2017 22:24:49 +0000 (22:24 +0000)]
Merge "simpleperf: fix report_sample_test."
am: 7b615cfb00

Change-Id: I78396b488f169a2856b66739e97d28015d867927

7 years agoMerge "simpleperf: fix report_sample_test."
Treehugger Robot [Mon, 15 May 2017 22:18:18 +0000 (22:18 +0000)]
Merge "simpleperf: fix report_sample_test."

7 years agosimpleperf: fix report_sample_test.
Yabin Cui [Mon, 15 May 2017 20:39:36 +0000 (13:39 -0700)]
simpleperf: fix report_sample_test.

When running cmd_report_sample.* tests, it may call
ReportSampleCmd()->Run() more than once. If we shutdown
protobuf library in one call, using protobuf in the
following calls will encounter failures.

Bug: http://b/37996565
Test: run CtsSimpleperfTestCases.
Change-Id: I5ca217406e786645d45fda518055c4a63ab3db3c

7 years agoresolve merge conflicts of d38ce6ce to oc-dev-plus-aosp
Elliott Hughes [Sat, 13 May 2017 01:10:44 +0000 (01:10 +0000)]
resolve merge conflicts of d38ce6ce to oc-dev-plus-aosp
am: bd2d5da516

Change-Id: I236d539a49f2c8ec49afe7b6c5e58e99bd602982

7 years agoresolve merge conflicts of d38ce6ce to oc-dev-plus-aosp
Elliott Hughes [Sat, 13 May 2017 00:43:09 +0000 (17:43 -0700)]
resolve merge conflicts of d38ce6ce to oc-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I589f393be9d6ce0cf76afbd39d8e28d3fb6046d9

7 years agoMerge "Switch to libkeyutils." am: 70c39c84be
Elliott Hughes [Sat, 13 May 2017 00:34:08 +0000 (00:34 +0000)]
Merge "Switch to libkeyutils." am: 70c39c84be
am: 2cb7eeed03

Change-Id: I631fe660ef8a38558d5653ee2d64e274837286ea

7 years agoMerge "Switch to libkeyutils."
Elliott Hughes [Sat, 13 May 2017 00:32:11 +0000 (00:32 +0000)]
Merge "Switch to libkeyutils."
am: 70c39c84be

Change-Id: Icc52051c57c4b7783d05b53c9f10e4ba4a826f87

7 years agoMerge "Switch to libkeyutils."
Elliott Hughes [Sat, 13 May 2017 00:28:25 +0000 (00:28 +0000)]
Merge "Switch to libkeyutils."

7 years agoMerge "simpleperf: make pprof_proto_generator.py work without binary_cache_dir."...
Yabin Cui [Fri, 12 May 2017 20:53:48 +0000 (20:53 +0000)]
Merge "simpleperf: make pprof_proto_generator.py work without binary_cache_dir." am: de5a219880 am: 62fca012be am: eee773dcbe
am: 538e31abb5

Change-Id: I80d2ca11cbe138e4a57b5066e7961cc5a886251b

7 years agoMerge "simpleperf: make pprof_proto_generator.py work without binary_cache_dir."...
Yabin Cui [Fri, 12 May 2017 20:35:44 +0000 (20:35 +0000)]
Merge "simpleperf: make pprof_proto_generator.py work without binary_cache_dir." am: de5a219880 am: 62fca012be
am: eee773dcbe

Change-Id: I5bd0c98adcd0af897bec95ec1f64bf48f8723d7d

7 years agoMerge "simpleperf: make pprof_proto_generator.py work without binary_cache_dir."...
Yabin Cui [Fri, 12 May 2017 20:34:12 +0000 (20:34 +0000)]
Merge "simpleperf: make pprof_proto_generator.py work without binary_cache_dir." am: de5a219880
am: 62fca012be

Change-Id: I80073e30bdb126542dad9a42a9d0cd0ee485879b

7 years agoMerge "simpleperf: make pprof_proto_generator.py work without binary_cache_dir."
Yabin Cui [Fri, 12 May 2017 20:32:11 +0000 (20:32 +0000)]
Merge "simpleperf: make pprof_proto_generator.py work without binary_cache_dir."
am: de5a219880

Change-Id: I62ff76e829a2d4b59b1f1c7f6a1bc09b7305e78c

7 years agoMerge "simpleperf: make pprof_proto_generator.py work without binary_cache_dir."
Yabin Cui [Fri, 12 May 2017 20:25:16 +0000 (20:25 +0000)]
Merge "simpleperf: make pprof_proto_generator.py work without binary_cache_dir."

7 years agosimpleperf: make pprof_proto_generator.py work without binary_cache_dir.
Yabin Cui [Fri, 12 May 2017 18:23:06 +0000 (11:23 -0700)]
simpleperf: make pprof_proto_generator.py work without binary_cache_dir.

Bug: http://b/32834638
Test: run pprof_prot_generator.py with only perf.data.
Change-Id: I686d6e968ab8703402223334e8ddb83e966a08f8

7 years agoSwitch to libkeyutils.
Elliott Hughes [Wed, 10 May 2017 00:04:14 +0000 (17:04 -0700)]
Switch to libkeyutils.

Bug: http://b/37991155
Test: builds+boots
Change-Id: Iba763eccc0768f58ce7b51d861f13e51d91ec382

7 years agolibf2fs_sparseblock: Android.mk->Android.bp
Jayant Chowdhary [Wed, 10 May 2017 02:12:01 +0000 (19:12 -0700)]
libf2fs_sparseblock: Android.mk->Android.bp

Test: mm -j64

Bug: 37567578

Change-Id: I9a92406bfc150d9effae89a93b1ee07f7ad6d001

7 years agoSwitch to libkeyutils.
Elliott Hughes [Wed, 10 May 2017 00:04:14 +0000 (17:04 -0700)]
Switch to libkeyutils.

Bug: http://b/37991155
Test: builds+boots
Change-Id: Iba763eccc0768f58ce7b51d861f13e51d91ec382

7 years agoMerge "Port libtestUtil to use Android.bp"
TreeHugger Robot [Tue, 9 May 2017 20:24:51 +0000 (20:24 +0000)]
Merge "Port libtestUtil to use Android.bp"

7 years agoMerge "simpleperf: fix some format error in README.md." am: adbce4d3b7 am: f3a86d7106...
Yabin Cui [Tue, 9 May 2017 18:44:18 +0000 (18:44 +0000)]
Merge "simpleperf: fix some format error in README.md." am: adbce4d3b7 am: f3a86d7106 am: 057668237c
am: 4924660b19

Change-Id: I8950079eb426cd58bd11a0fbbdb97b33502466bc

7 years agoMerge "simpleperf: fix some format error in README.md." am: adbce4d3b7 am: f3a86d7106
Yabin Cui [Tue, 9 May 2017 17:54:11 +0000 (17:54 +0000)]
Merge "simpleperf: fix some format error in README.md." am: adbce4d3b7 am: f3a86d7106
am: 057668237c

Change-Id: Ib5a68e36f32b9b6979a83b89a3689085dac677f9

7 years agoMerge "simpleperf: fix some format error in README.md." am: adbce4d3b7
Yabin Cui [Tue, 9 May 2017 17:50:06 +0000 (17:50 +0000)]
Merge "simpleperf: fix some format error in README.md." am: adbce4d3b7
am: f3a86d7106

Change-Id: Ide9c372b7d0b4f647203f0e11fd0cf802884e00c

7 years agoMerge "simpleperf: fix some format error in README.md."
Yabin Cui [Tue, 9 May 2017 17:46:37 +0000 (17:46 +0000)]
Merge "simpleperf: fix some format error in README.md."
am: adbce4d3b7

Change-Id: If04b65c9b5c1906c2b7f0e0e123c9bd6bf8034ca

7 years agoMerge "simpleperf: fix some format error in README.md."
Treehugger Robot [Tue, 9 May 2017 17:28:45 +0000 (17:28 +0000)]
Merge "simpleperf: fix some format error in README.md."

7 years agoFix wrong usage of * in find command am: cbc89e80bf -s ours
Po Hu [Tue, 9 May 2017 00:34:24 +0000 (00:34 +0000)]
Fix wrong usage of * in find command am: cbc89e80bf  -s ours
am: 3c32bdfda7  -s ours

Change-Id: I67d5ae07e11cc67f473be85367fefbd9ee63bd5e

7 years agoFix wrong usage of * in find command
Po Hu [Tue, 9 May 2017 00:28:05 +0000 (00:28 +0000)]
Fix wrong usage of * in find command
am: cbc89e80bf  -s ours

Change-Id: Ia39cff30cdb118026b5ff67522be8f01a7e0c5f0

7 years agoMerge "simpleperf: fix scripts to be runnable by python3." am: f0e9a51c86 am: b01e304...
Yabin Cui [Mon, 8 May 2017 23:12:57 +0000 (23:12 +0000)]
Merge "simpleperf: fix scripts to be runnable by python3." am: f0e9a51c86 am: b01e304a0c am: 151c3cda1c
am: a42fecb428

Change-Id: I5bd0573032a58b549b70dea8d4e732035e6e94c2

7 years agoMerge "simpleperf: fix scripts to be runnable by python3." am: f0e9a51c86 am: b01e304a0c
Yabin Cui [Mon, 8 May 2017 23:10:59 +0000 (23:10 +0000)]
Merge "simpleperf: fix scripts to be runnable by python3." am: f0e9a51c86 am: b01e304a0c
am: 151c3cda1c

Change-Id: I79a8559de6b2f8ba438649f18c74d810035b7b66

7 years agoMerge "simpleperf: fix scripts to be runnable by python3." am: f0e9a51c86
Yabin Cui [Mon, 8 May 2017 23:09:24 +0000 (23:09 +0000)]
Merge "simpleperf: fix scripts to be runnable by python3." am: f0e9a51c86
am: b01e304a0c

Change-Id: Ia9e62bd3ebc09d149e29805ee9cdfb81b1c26354

7 years agoMerge "simpleperf: fix scripts to be runnable by python3."
Yabin Cui [Mon, 8 May 2017 23:07:26 +0000 (23:07 +0000)]
Merge "simpleperf: fix scripts to be runnable by python3."
am: f0e9a51c86

Change-Id: I8dffcae8ee749793e480f25da81b5b78e2cf65d9

7 years agoMerge "simpleperf: fix scripts to be runnable by python3."
Treehugger Robot [Mon, 8 May 2017 22:59:20 +0000 (22:59 +0000)]
Merge "simpleperf: fix scripts to be runnable by python3."

7 years agoMerge "simpleperf: update simpleperf prebuilts to build 3984832." am: e720a7afbd...
Yabin Cui [Mon, 8 May 2017 22:59:11 +0000 (22:59 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build 3984832." am: e720a7afbd am: 6cc80e5a64 am: ea0570b2b4
am: 2c570acc9a

Change-Id: I590a7353cb7f6e4f583e23a6621198f2e6fa8a9d

7 years agosimpleperf: fix some format error in README.md.
Yabin Cui [Mon, 8 May 2017 21:33:48 +0000 (14:33 -0700)]
simpleperf: fix some format error in README.md.

Test: none
Change-Id: Ibc11990dc511fcf7eafc91becdb0383e4fb186e2

7 years agoMerge "simpleperf: update simpleperf prebuilts to build 3984832." am: e720a7afbd...
Yabin Cui [Mon, 8 May 2017 21:51:25 +0000 (21:51 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build 3984832." am: e720a7afbd am: 6cc80e5a64
am: ea0570b2b4

Change-Id: Ic8979653bf50788d7a0e33dbb19a049c6cbc44f0

7 years agoMerge "simpleperf: update simpleperf prebuilts to build 3984832." am: e720a7afbd
Yabin Cui [Mon, 8 May 2017 21:49:53 +0000 (21:49 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build 3984832." am: e720a7afbd
am: 6cc80e5a64

Change-Id: I8f72981461f0b1e70b135c795773e22713ae2142

7 years agoMerge "simpleperf: update simpleperf prebuilts to build 3984832."
Yabin Cui [Mon, 8 May 2017 21:41:11 +0000 (21:41 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build 3984832."
am: e720a7afbd

Change-Id: Id89acb17510d89cdc1a26dbb712815bbc2b0743a

7 years agoMerge "simpleperf: update simpleperf prebuilts to build 3984832."
Treehugger Robot [Mon, 8 May 2017 21:31:08 +0000 (21:31 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build 3984832."

7 years agosimpleperf: fix scripts to be runnable by python3.
Yabin Cui [Mon, 8 May 2017 21:23:19 +0000 (14:23 -0700)]
simpleperf: fix scripts to be runnable by python3.

Bug: http://b/32834638
Test: run scripts with demo using both python and python3.
Change-Id: I5cb7eb41bed0e2a91f4cbc97c386dd527aa3186a

7 years agoMerge "f2fs_utils: update f2fs utils to match 1.8.0" am: 6faee8ba54 am: cc663c64c2...
Jin Qian [Mon, 8 May 2017 20:53:32 +0000 (20:53 +0000)]
Merge "f2fs_utils: update f2fs utils to match 1.8.0" am: 6faee8ba54 am: cc663c64c2 am: b60c6ff179
am: 8d01045f38

Change-Id: Ic58a3733e9e871bd850d84554248b66f77c6ffa2

7 years agoMerge "f2fs_utils: update f2fs utils to match 1.8.0" am: 6faee8ba54 am: cc663c64c2
Jin Qian [Mon, 8 May 2017 20:50:32 +0000 (20:50 +0000)]
Merge "f2fs_utils: update f2fs utils to match 1.8.0" am: 6faee8ba54 am: cc663c64c2
am: b60c6ff179

Change-Id: I7c4fb7899e578a05283407fe34b7ec0b5a86575f

7 years agoMerge "f2fs_utils: update f2fs utils to match 1.8.0" am: 6faee8ba54
Jin Qian [Mon, 8 May 2017 20:47:07 +0000 (20:47 +0000)]
Merge "f2fs_utils: update f2fs utils to match 1.8.0" am: 6faee8ba54
am: cc663c64c2

Change-Id: Ia85efcd4133921b7a25b6c712cb21427cbb342ab

7 years agoMerge "f2fs_utils: update f2fs utils to match 1.8.0"
Jin Qian [Mon, 8 May 2017 20:44:43 +0000 (20:44 +0000)]
Merge "f2fs_utils: update f2fs utils to match 1.8.0"
am: 6faee8ba54

Change-Id: I41a2a4f6435f79bdb0723fc38dedf14ceb25a01b

7 years agoMerge "f2fs_utils: update f2fs utils to match 1.8.0"
Treehugger Robot [Mon, 8 May 2017 20:37:39 +0000 (20:37 +0000)]
Merge "f2fs_utils: update f2fs utils to match 1.8.0"

7 years agoPort libtestUtil to use Android.bp
Courtney Goeltzenleuchter [Fri, 5 May 2017 23:00:46 +0000 (17:00 -0600)]
Port libtestUtil to use Android.bp

Test: make
Bug: 29940137
Change-Id: I24299722722e6fe0e5e1c81e9e0d9d3631e29984

7 years agosimpleperf: update simpleperf prebuilts to build 3984832.
Yabin Cui [Mon, 8 May 2017 18:29:12 +0000 (11:29 -0700)]
simpleperf: update simpleperf prebuilts to build 3984832.

Taken from branch aosp-master.

Fix update.py for copying libwinpthread-1.dll.

Bug: http://b/37788631
Test: none

Change-Id: Ifb38fbdbed10941fef36c7a52cf973c67f0505cd

7 years agoFix wrong usage of * in find command
Po Hu [Tue, 25 Apr 2017 00:53:24 +0000 (08:53 +0800)]
Fix wrong usage of * in find command

When KATI_FIND_EMULATOR is disabled, the following warning message
will appear:
find: paths must precede expression: build_id.h
Usage: find [-H] [-L] [-P] [-Olevel]
[-D help|tree|search|stat|rates|opt|exec] [path...] [expression]

Because the * in 'find some/path -name *' command is wrongly
expanded by shell. We should change * to "*".

Change-Id: Ib051f47bb9335930944b8f63fd0fb54fbb867f31
Merged-In: Ib051f47bb9335930944b8f63fd0fb54fbb867f31
Test: make KATI_EMULATE_FIND=false
(cherry picked from 4432b6f3f41d3169c4759799722cf226adf5b579)
Bug: 37553659

7 years agoMerge "Add art files support to cppreopt copy"
TreeHugger Robot [Fri, 5 May 2017 22:03:04 +0000 (22:03 +0000)]
Merge "Add art files support to cppreopt copy"

7 years agoAdd art files support to cppreopt copy
Mathieu Chartier [Fri, 5 May 2017 17:56:11 +0000 (10:56 -0700)]
Add art files support to cppreopt copy

Preopted art files are now copied to classes.dex.

Test: adb shell rm /data/system/packages.xml
Test: adb shell rm -rf /data/dalvik-cache
Test: adb reboot
Test: adb shell ls -l /data/dalvik-cache/*/*  | grep Calc

Bug: 38033055

Change-Id: Ib7d1c65ff47cdb4ebb1829f6a87a885381aded15

7 years agof2fs_utils: update f2fs utils to match 1.8.0
Jin Qian [Fri, 28 Apr 2017 22:00:57 +0000 (15:00 -0700)]
f2fs_utils: update f2fs utils to match 1.8.0

Expose f2fs_configuration via dlsym and use first device for output.

Test: format userdata to f2fs and boot
Bug: 37758867
Change-Id: Iee011f551f192f643f7b6443b37f65d354491f20

7 years agoMerge "simpleperf: fix scripts on windows." am: f942f9570e am: 28d4877ea3 am: 5ae7314bed
Yabin Cui [Fri, 5 May 2017 05:36:57 +0000 (05:36 +0000)]
Merge "simpleperf: fix scripts on windows." am: f942f9570e am: 28d4877ea3 am: 5ae7314bed
am: 47e0b3f33d

Change-Id: I47781e579e04144c9e552c69e59960619750929e

7 years agoMerge "simpleperf: fix tracing counters." am: 2a427fcc8b am: f9d8e454b6 am: 489c9835f6
Yabin Cui [Fri, 5 May 2017 05:36:31 +0000 (05:36 +0000)]
Merge "simpleperf: fix tracing counters." am: 2a427fcc8b am: f9d8e454b6 am: 489c9835f6
am: 95b535d880

Change-Id: Ic5fb1ef6c37d5822cb5e5ac85a04a11c7d27a0f0

7 years agoMerge "simpleperf: fix scripts on windows." am: f942f9570e am: 28d4877ea3
Yabin Cui [Fri, 5 May 2017 05:33:59 +0000 (05:33 +0000)]
Merge "simpleperf: fix scripts on windows." am: f942f9570e am: 28d4877ea3
am: 5ae7314bed

Change-Id: Icb3b7a3acfc33ba2e41272bae7dc83ff43c3af31

7 years agoMerge "simpleperf: fix tracing counters." am: 2a427fcc8b am: f9d8e454b6
Yabin Cui [Fri, 5 May 2017 05:33:42 +0000 (05:33 +0000)]
Merge "simpleperf: fix tracing counters." am: 2a427fcc8b am: f9d8e454b6
am: 489c9835f6

Change-Id: I460cbfe7d89071dccf220982668d09db4787d238

7 years agoMerge "simpleperf: fix scripts on windows." am: f942f9570e
Yabin Cui [Fri, 5 May 2017 05:31:33 +0000 (05:31 +0000)]
Merge "simpleperf: fix scripts on windows." am: f942f9570e
am: 28d4877ea3

Change-Id: I6659ed5808f4c4a79efa3db8b40a6a8767712bf6

7 years agoMerge "simpleperf: fix tracing counters." am: 2a427fcc8b
Yabin Cui [Fri, 5 May 2017 05:31:13 +0000 (05:31 +0000)]
Merge "simpleperf: fix tracing counters." am: 2a427fcc8b
am: f9d8e454b6

Change-Id: I27fe08451102e819168f5a13ce044d105c2ff40b

7 years agoMerge "simpleperf: fix scripts on windows."
Yabin Cui [Fri, 5 May 2017 05:29:25 +0000 (05:29 +0000)]
Merge "simpleperf: fix scripts on windows."
am: f942f9570e

Change-Id: I6dbbf85b0954e00e57e41badf43e52277b6f430f

7 years agoMerge "simpleperf: fix tracing counters."
Yabin Cui [Fri, 5 May 2017 05:29:10 +0000 (05:29 +0000)]
Merge "simpleperf: fix tracing counters."
am: 2a427fcc8b

Change-Id: Ic01a5a8a85b0c319cb3e8bebeac857a1f30814ef

7 years agoMerge "simpleperf: fix scripts on windows."
Treehugger Robot [Fri, 5 May 2017 05:25:28 +0000 (05:25 +0000)]
Merge "simpleperf: fix scripts on windows."

7 years agoMerge "simpleperf: fix tracing counters."
Treehugger Robot [Fri, 5 May 2017 05:23:29 +0000 (05:23 +0000)]
Merge "simpleperf: fix tracing counters."

7 years agosimpleperf: fix tracing counters.
Yabin Cui [Thu, 4 May 2017 18:28:09 +0000 (11:28 -0700)]
simpleperf: fix tracing counters.

Previously prev_counter is an uninitialized value, which makes
the tracing result not correct.

Test: run simpleperf/systrace.py to profile an app.
Change-Id: I440771f705e22dec7a2948cb2f1164c17d41259a

7 years agoMerge "simpleperf: add META_INFO feature section in perf.data." am: 3fb00aedf2 am...
Yabin Cui [Thu, 4 May 2017 01:59:37 +0000 (01:59 +0000)]
Merge "simpleperf: add META_INFO feature section in perf.data." am: 3fb00aedf2 am: 9e63c11291 am: b502fcc705
am: a4fd5b7df3

Change-Id: I89fa90bf8e29403926cc64859a8ec672e7f76a34

7 years agoMerge "simpleperf: add META_INFO feature section in perf.data." am: 3fb00aedf2 am...
Yabin Cui [Thu, 4 May 2017 01:55:18 +0000 (01:55 +0000)]
Merge "simpleperf: add META_INFO feature section in perf.data." am: 3fb00aedf2 am: 9e63c11291
am: b502fcc705

Change-Id: I949981cef1b509bb7808ef848c8492bd1a942ebb

7 years agoMerge "simpleperf: add META_INFO feature section in perf.data." am: 3fb00aedf2
Yabin Cui [Thu, 4 May 2017 01:52:47 +0000 (01:52 +0000)]
Merge "simpleperf: add META_INFO feature section in perf.data." am: 3fb00aedf2
am: 9e63c11291

Change-Id: If9c4155aac1273bad9c4db1137b60e065a8933bc

7 years agoMerge "simpleperf: add META_INFO feature section in perf.data."
Yabin Cui [Thu, 4 May 2017 01:50:16 +0000 (01:50 +0000)]
Merge "simpleperf: add META_INFO feature section in perf.data."
am: 3fb00aedf2

Change-Id: Ic217649fd408594ded247687aa1fb8563fee437c

7 years agoMerge "simpleperf: add META_INFO feature section in perf.data."
Treehugger Robot [Thu, 4 May 2017 01:43:56 +0000 (01:43 +0000)]
Merge "simpleperf: add META_INFO feature section in perf.data."

7 years agosimpleperf: add META_INFO feature section in perf.data.
Yabin Cui [Wed, 3 May 2017 23:34:02 +0000 (16:34 -0700)]
simpleperf: add META_INFO feature section in perf.data.

META_INFO section can be used to pass some small information
in perf.data.

Add simpleperf_version in META_INFO section for debugging.

Bug: http://b/37960318
Test: run simpleperf_unit_test.
Change-Id: If17a147bbc77b5af063fbf77e02ca81430afb8a5

7 years agoMerge "Remove e4crypt_do_init_user0" am: 8ebd2b14a2 am: 52cdeee3d1 am: 55df4d90f0
Tom Cherry [Wed, 3 May 2017 22:36:00 +0000 (22:36 +0000)]
Merge "Remove e4crypt_do_init_user0" am: 8ebd2b14a2 am: 52cdeee3d1 am: 55df4d90f0
am: 8a12029190

Change-Id: I76ac28835bbec3ebbdb5e4fe20387184c67ddf20

7 years agoMerge "Remove e4crypt_do_init_user0" am: 8ebd2b14a2 am: 52cdeee3d1
Tom Cherry [Wed, 3 May 2017 22:30:46 +0000 (22:30 +0000)]
Merge "Remove e4crypt_do_init_user0" am: 8ebd2b14a2 am: 52cdeee3d1
am: 55df4d90f0

Change-Id: Ib5147e8b535977c40daa6ba1d3281aed7b7bd8c9

7 years agoMerge "Remove e4crypt_do_init_user0" am: 8ebd2b14a2
Tom Cherry [Wed, 3 May 2017 22:28:09 +0000 (22:28 +0000)]
Merge "Remove e4crypt_do_init_user0" am: 8ebd2b14a2
am: 52cdeee3d1

Change-Id: Icacff9aff9dc0e12c1bb47ca53e874bdbc6cb1dd