OSDN Git Service
Tao Bao [Fri, 16 Dec 2016 23:02:04 +0000 (23:02 +0000)]
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am:
6727a1e718 am:
9ac16f1f48 am:
8b3b60cbf9 -s ours am:
2984aca213
am:
09b874ff31
Change-Id: I2050aa51ee3cd719eccc0fc8854436aaadddacc6
Alex Light [Fri, 16 Dec 2016 23:01:46 +0000 (23:01 +0000)]
Merge "merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
96c347a9b9 am:
627cc3afb3 am:
c51d68746c am:
93f8319bc7" into nyc-mr2-dev-plus-aosp
am:
2a99ed4f32
Change-Id: I114503d0e32d8893fd1ddb97c9c6f403aeb7ee0a
Alex Light [Fri, 16 Dec 2016 23:01:45 +0000 (23:01 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
96c347a9b9 am:
627cc3afb3 am:
c51d68746c am:
93f8319bc7
am:
393520d70a
Change-Id: I14123dad24c8f85de43ec9134b1ef64b83cef2e7
Alex Light [Fri, 16 Dec 2016 23:01:33 +0000 (23:01 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
96c347a9b9 am:
627cc3afb3 am:
c51d68746c am:
539556ac79
am:
a40737964a
Change-Id: I8a236339b832456cc25cd122aa152ac07a4068cc
Tao Bao [Fri, 16 Dec 2016 22:58:29 +0000 (22:58 +0000)]
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am:
6727a1e718 am:
9ac16f1f48 am:
8b3b60cbf9 -s ours
am:
2984aca213
Change-Id: I190a9d950f79159be5ab729364aaff3d84ed9bd1
Tao Bao [Fri, 16 Dec 2016 22:50:34 +0000 (22:50 +0000)]
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am:
6727a1e718 am:
9ac16f1f48
am:
8b3b60cbf9 -s ours
Change-Id: I9f3531f12a1ad1503650a93175bc02b9a9129db7
Android Build Merger (Role) [Fri, 16 Dec 2016 22:45:57 +0000 (22:45 +0000)]
Merge "merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
96c347a9b9 am:
627cc3afb3 am:
c51d68746c am:
93f8319bc7" into nyc-mr2-dev-plus-aosp
Alex Light [Fri, 16 Dec 2016 22:45:50 +0000 (22:45 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
96c347a9b9 am:
627cc3afb3 am:
c51d68746c
am:
93f8319bc7
Change-Id: If880ae034045c4bb131e77a7a055f9d8656ca731
Alex Light [Fri, 16 Dec 2016 22:45:45 +0000 (22:45 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
96c347a9b9 am:
627cc3afb3 am:
c51d68746c
am:
539556ac79
Change-Id: I01fb922ced6599fa4a56d29950e153b5f1b52821
Alex Light [Fri, 16 Dec 2016 22:37:59 +0000 (22:37 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
96c347a9b9 am:
627cc3afb3
am:
c51d68746c
Change-Id: I798399783afb1daccd820921ed382ff9e8d515a9
Alex Light [Fri, 16 Dec 2016 22:37:45 +0000 (22:37 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
96c347a9b9 am:
627cc3afb3
am:
c51d68746c
Change-Id: I28727204b16e0cb6c45a2ab3305fb2913278975c
Tao Bao [Fri, 16 Dec 2016 22:29:30 +0000 (22:29 +0000)]
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am:
6727a1e718
am:
9ac16f1f48
Change-Id: I728adaba03fa4c671a8b04471d9f9f9b78aaf532
Alex Light [Fri, 16 Dec 2016 22:29:22 +0000 (22:29 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
96c347a9b9
am:
627cc3afb3
Change-Id: Ia68bc020f5eb4a97f0c66bd944f27dc0156d4a6d
Tao Bao [Fri, 16 Dec 2016 22:20:39 +0000 (22:20 +0000)]
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev
am:
6727a1e718
Change-Id: I257cedf0b05301148604e4bbfe24b95bd5c5d479
Alex Light [Fri, 16 Dec 2016 22:20:28 +0000 (22:20 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev
am:
96c347a9b9
Change-Id: I9a44b38e4aac14d6c41481ef58637bc873a8f85e
Yabin Cui [Fri, 16 Dec 2016 22:01:00 +0000 (22:01 +0000)]
Merge "simpleperf: use per process maps." am:
c35b5e2d4f am:
e594679674 am:
05cb0b3a48
am:
b42d3daa2a
Change-Id: Ic709bb45b1e58aaadd8fa30e29e32e68a837b568
Yabin Cui [Fri, 16 Dec 2016 21:54:05 +0000 (21:54 +0000)]
Merge "simpleperf: use per process maps." am:
c35b5e2d4f am:
e594679674
am:
05cb0b3a48
Change-Id: Id148d91fb51dc216cda8f1f72a54f10bb32cce86
Yabin Cui [Fri, 16 Dec 2016 21:47:07 +0000 (21:47 +0000)]
Merge "simpleperf: use per process maps." am:
c35b5e2d4f
am:
e594679674
Change-Id: I29d9803bb8f445634f05b1068ad6cc34f2bf6f9b
Yabin Cui [Fri, 16 Dec 2016 21:39:38 +0000 (21:39 +0000)]
Merge "simpleperf: use per process maps."
am:
c35b5e2d4f
Change-Id: I79f2adafd007aaff8f302724083dd165ca3ba975
Yabin Cui [Fri, 16 Dec 2016 21:27:58 +0000 (21:27 +0000)]
Merge "simpleperf: use per process maps."
Yabin Cui [Thu, 15 Dec 2016 19:24:03 +0000 (11:24 -0800)]
simpleperf: use per process maps.
Originally we use per thread maps, and copy the maps from parent thread
when processing ForkRecord. But there are situations that ForkRecords
are lost, then the new thread is left having no maps, which leads to unknown
dso/symbols.
To fix this, we can use per process maps. Even if ForkRecords are lost,
we know which process a SampleRecord belongs to, and can use the process maps.
This is reasonable because in most cases, new threads in the same thread group
are created with both CLONE_THREAD and CLONE_VM.
Bug: http://b/
33503165
Test: run simpleperf_unit_test.
Change-Id: If84b6cdac39cd6ad4e441ed6d75ed879b86d1830
Yabin Cui [Fri, 16 Dec 2016 19:23:08 +0000 (19:23 +0000)]
Merge "simpleperf: add script to annotate source code." am:
dcfabd1ef6 am:
0ef4d4fd5f am:
706631a1a0
am:
71a252b7b5
Change-Id: I0dd570c5867ce4822b0c2e88e1fd91fd76048354
Yabin Cui [Fri, 16 Dec 2016 19:08:16 +0000 (19:08 +0000)]
Merge "simpleperf: add script to annotate source code." am:
dcfabd1ef6 am:
0ef4d4fd5f
am:
706631a1a0
Change-Id: If8d44ef7b2e7d42b785f45c44854ba12dce33f77
Yabin Cui [Fri, 16 Dec 2016 19:00:14 +0000 (19:00 +0000)]
Merge "simpleperf: add script to annotate source code." am:
dcfabd1ef6
am:
0ef4d4fd5f
Change-Id: I9c06aabee64e37a0776f1caf912b0720f8e122b0
Yabin Cui [Fri, 16 Dec 2016 18:52:14 +0000 (18:52 +0000)]
Merge "simpleperf: add script to annotate source code."
am:
dcfabd1ef6
Change-Id: Ic404aff504bb64e0fa0333e3fd8fed169f6b5980
Yabin Cui [Fri, 16 Dec 2016 18:39:12 +0000 (18:39 +0000)]
Merge "simpleperf: add script to annotate source code."
Jeff Sharkey [Fri, 16 Dec 2016 05:52:04 +0000 (05:52 +0000)]
Merge "Add new ext4 feature flags from kernel." am:
d36c1d41ad am:
06b26159ac am:
b2ce78c48d
am:
d34917d19d
Change-Id: I81724d0922d553b1c11bdb930e23d2a6684ffc10
Jeff Sharkey [Fri, 16 Dec 2016 05:44:57 +0000 (05:44 +0000)]
Merge "Add new ext4 feature flags from kernel." am:
d36c1d41ad am:
06b26159ac
am:
b2ce78c48d
Change-Id: Ie0089a8b0d8600e9e0ac98a89c8f76a159c34f67
Jeff Sharkey [Fri, 16 Dec 2016 05:37:00 +0000 (05:37 +0000)]
Merge "Add new ext4 feature flags from kernel." am:
d36c1d41ad
am:
06b26159ac
Change-Id: I4707bc4349446a888b30c8f08fc53ab2da621173
Jeff Sharkey [Fri, 16 Dec 2016 05:06:15 +0000 (05:06 +0000)]
Merge "Add new ext4 feature flags from kernel."
am:
d36c1d41ad
Change-Id: I4dbc6beeff002b81d61bcab1430e3dff1d9605f8
Jeff Sharkey [Fri, 16 Dec 2016 04:56:39 +0000 (04:56 +0000)]
Merge "Add new ext4 feature flags from kernel."
Jeff Sharkey [Thu, 15 Dec 2016 23:48:21 +0000 (16:48 -0700)]
Add new ext4 feature flags from kernel.
Test: builds
Bug:
27948817
Change-Id: I74fb403ff6173f475190894104fd8b1b82523fb5
Yabin Cui [Tue, 13 Dec 2016 02:18:07 +0000 (18:18 -0800)]
simpleperf: add script to annotate source code.
Bug: http://b/
32834638
Test: run python annotate.py on some apps.
Change-Id: Ib89e80af495ace6239351888db974e8fb5090403
Yunlian Jiang [Thu, 15 Dec 2016 00:41:04 +0000 (00:41 +0000)]
Merge "fix warning: Potential leak of memory pointed to by 'bench'" am:
43b28bc67b am:
b03e1977e6 am:
db0b38fb19
am:
a576f9935c
Change-Id: I927172326f5611c81a6749a10664c49ab3b3821a
Yunlian Jiang [Wed, 14 Dec 2016 23:55:56 +0000 (23:55 +0000)]
Merge "fix warning: Potential leak of memory pointed to by 'bench'" am:
43b28bc67b am:
b03e1977e6
am:
db0b38fb19
Change-Id: I91bac4dac516d6a404889bdbff837efc09873dca
Yunlian Jiang [Wed, 14 Dec 2016 23:48:26 +0000 (23:48 +0000)]
Merge "fix warning: Potential leak of memory pointed to by 'bench'" am:
43b28bc67b
am:
b03e1977e6
Change-Id: I75e923a774f35e8cf8a6f48c2437b5862e68c1e2
Yunlian Jiang [Wed, 14 Dec 2016 23:40:53 +0000 (23:40 +0000)]
Merge "fix warning: Potential leak of memory pointed to by 'bench'"
am:
43b28bc67b
Change-Id: Ie8fc71eb48d33dba7fc68232b2d4502ee3259d89
Treehugger Robot [Wed, 14 Dec 2016 23:34:11 +0000 (23:34 +0000)]
Merge "fix warning: Potential leak of memory pointed to by 'bench'"
Yabin Cui [Wed, 14 Dec 2016 19:02:00 +0000 (19:02 +0000)]
Merge "simpleperf: check invalid perf.data." am:
20eac2aa36 am:
3486ef2ed6 am:
40456825a1
am:
4a9bc6bfc7
Change-Id: I5f7516620e7f10fe0d3e8e2950826b070dd8250e
Yabin Cui [Wed, 14 Dec 2016 18:55:30 +0000 (18:55 +0000)]
Merge "simpleperf: check invalid perf.data." am:
20eac2aa36 am:
3486ef2ed6
am:
40456825a1
Change-Id: I3148c6accd42c958082afb74e9f29f05335dd285
Yabin Cui [Wed, 14 Dec 2016 18:48:25 +0000 (18:48 +0000)]
Merge "simpleperf: check invalid perf.data." am:
20eac2aa36
am:
3486ef2ed6
Change-Id: I3c796b156c7e3ad51b9a56e14a95259ff2e7ee22
Yabin Cui [Wed, 14 Dec 2016 18:42:19 +0000 (18:42 +0000)]
Merge "simpleperf: check invalid perf.data."
am:
20eac2aa36
Change-Id: I07ebac8248ce921dc42e832a3d388b0a31530e20
Yabin Cui [Wed, 14 Dec 2016 18:31:51 +0000 (18:31 +0000)]
Merge "simpleperf: check invalid perf.data."
Yabin Cui [Wed, 14 Dec 2016 01:49:19 +0000 (17:49 -0800)]
simpleperf: check invalid perf.data.
Bug: http://b/
33558210
Test: run simpleperf_unit_test.
Change-Id: If5a1f7fc9c436a39776f80f1e52479f1cd7ff407
Yunlian Jiang [Wed, 14 Dec 2016 01:05:50 +0000 (17:05 -0800)]
fix warning: Potential leak of memory pointed to by 'bench'
Bug: None
Test: The warning is gone.
Change-Id: Ifbe4550b372333f81bc0ff88b25687dfd0b64be9
Yabin Cui [Wed, 14 Dec 2016 00:54:59 +0000 (00:54 +0000)]
Merge "simpleperf: check monitored targets regularly." am:
923268ef1e am:
4d2b6f684e am:
a2e2a358dc
am:
eeaa4eeee4
Change-Id: Iff7b8ccd8191d9bb41311ee2daefa43d8481c43b
Yabin Cui [Wed, 14 Dec 2016 00:47:32 +0000 (00:47 +0000)]
Merge "simpleperf: check monitored targets regularly." am:
923268ef1e am:
4d2b6f684e
am:
a2e2a358dc
Change-Id: I3ee1d5978f8f355ff64934655b17da3e18e7320c
Yabin Cui [Wed, 14 Dec 2016 00:40:46 +0000 (00:40 +0000)]
Merge "simpleperf: check monitored targets regularly." am:
923268ef1e
am:
4d2b6f684e
Change-Id: Ib09e5969ed637a6f9dfdb8ba65af8384b6a323fb
Yabin Cui [Wed, 14 Dec 2016 00:34:15 +0000 (00:34 +0000)]
Merge "simpleperf: check monitored targets regularly."
am:
923268ef1e
Change-Id: I66ab80242a5f42efc67d114cd60b0e033054977b
Yabin Cui [Wed, 14 Dec 2016 00:29:55 +0000 (00:29 +0000)]
Merge "simpleperf: check monitored targets regularly."
Yabin Cui [Tue, 13 Dec 2016 21:47:49 +0000 (13:47 -0800)]
simpleperf: check monitored targets regularly.
When monitoring some threads/processes not forked by simpleperf,
check if these threads/processes exist regularly. So we can
stop profiling once all threads/processes exit.
Also handle SIGHUP signal, so we can finish profiling properly
when `adb shell simpleperf record xxx` is killed by Ctrl-C.
Add corresponding tests.
Bug: http://b/
33558210
Test: run simpleperf_unit_test.
Change-Id: Ieae4d00d099dc1c7a0c51b0610dff43981bb642e
Yabin Cui [Mon, 12 Dec 2016 22:27:46 +0000 (22:27 +0000)]
Merge "simpleperf: add script to manage app profiling process." am:
88ff807ea2 am:
b1b51ee271 am:
75c08bc62f
am:
2cd38e216d
Change-Id: Iacb6a47c70b610890535ddb00bdfd04300fc20aa
Yabin Cui [Mon, 12 Dec 2016 22:21:44 +0000 (22:21 +0000)]
Merge "simpleperf: add script to manage app profiling process." am:
88ff807ea2 am:
b1b51ee271
am:
75c08bc62f
Change-Id: Ic80471cd6cc817ecc6099226b9f2e2a30a165322
Yabin Cui [Mon, 12 Dec 2016 22:15:12 +0000 (22:15 +0000)]
Merge "simpleperf: add script to manage app profiling process." am:
88ff807ea2
am:
b1b51ee271
Change-Id: I830b8aa8fbd229b18655bc6d2701dd7570d7faff
Yabin Cui [Mon, 12 Dec 2016 22:09:10 +0000 (22:09 +0000)]
Merge "simpleperf: add script to manage app profiling process."
am:
88ff807ea2
Change-Id: I686b0b49fee06212442b0c076628dfd2cd449c88
Yabin Cui [Mon, 12 Dec 2016 22:00:27 +0000 (22:00 +0000)]
Merge "simpleperf: add script to manage app profiling process."
Yabin Cui [Mon, 5 Dec 2016 22:26:02 +0000 (14:26 -0800)]
simpleperf: add script to manage app profiling process.
app_profiler.py follows the instruction of profiling an
app in README.md. Users can just set the configuration,
and let app_profiler.py do environment setup, profiling
and data collection work.
Bug: http://b/
32834638
Test: run app_profiler.py on android M, N, O.
Change-Id: I2e08790396b02df32320eaa27b75d49108f4856f
Yabin Cui [Sat, 10 Dec 2016 01:50:06 +0000 (01:50 +0000)]
Merge "simpleperf: Improve Callgraph." am:
37dd326f5a am:
2577b42281 am:
286f73ee1b
am:
8b1b311af5
Change-Id: Ie002d451f43b9fcac1cd4cf505a602b29601f3be
Yabin Cui [Sat, 10 Dec 2016 01:44:01 +0000 (01:44 +0000)]
Merge "simpleperf: Improve Callgraph." am:
37dd326f5a am:
2577b42281
am:
286f73ee1b
Change-Id: Icc3d21d3946f8b3dee3def48fd430c3e2c738d23
Yabin Cui [Sat, 10 Dec 2016 01:37:59 +0000 (01:37 +0000)]
Merge "simpleperf: Improve Callgraph." am:
37dd326f5a
am:
2577b42281
Change-Id: I62a3a20aca469fa27ece789f975199c1d5c52901
Yabin Cui [Sat, 10 Dec 2016 01:31:58 +0000 (01:31 +0000)]
Merge "simpleperf: Improve Callgraph."
am:
37dd326f5a
Change-Id: I5a070a95482df4234d7df269f826ff11d701eb3c
Yabin Cui [Sat, 10 Dec 2016 01:24:19 +0000 (01:24 +0000)]
Merge "simpleperf: Improve Callgraph."
Yabin Cui [Fri, 9 Dec 2016 22:51:04 +0000 (14:51 -0800)]
simpleperf: Improve Callgraph.
1. Reduce columns used by callgraph by reducing spaces between
entries from 11 to 4. This helps to show more entries in the limited screen width.
2. Add [hit-in-function] line for each entry, so we know the percentage
of samples hit in the function and samples hit in the children functions.
3. Add --kallsyms option for report command.
After all, The callgraph is changed like below.
Before change:
|--99.08%-- java.lang.Thread.run
| void com.example.cyb.tappydefender.TDView.run()
| |
| | |--95.63%-- void com.example.cyb.tappydefender.TDView.draw()
After change:
|--98.85%-- java.lang.Thread.run
| void com.example.cyb.tappydefender.TDView.run()
| |--0.09%-- [hit in function]
| |
| |--95.54%-- void com.example.cyb.tappydefender.TDView.draw()
Bug: http://b/
33356538
Test: run simpleperf_unit_test.
Test: run simpleperf report -g manually.
Change-Id: Ifc1846d4ee7469cadbcc727cae6bf59552d919d5
Ethan Yonker [Wed, 7 Dec 2016 19:43:12 +0000 (19:43 +0000)]
Merge "ext4_utils: Fix return value in e4crypt_policy_get" am:
6c26bba8a9 am:
6c0637a8f5 am:
7e9786d791
am:
b14e85ecfb
Change-Id: I8684b6a873644c8b7a165afad1e31adc87c209e4
Ethan Yonker [Wed, 7 Dec 2016 19:39:17 +0000 (19:39 +0000)]
Merge "ext4_utils: Fix return value in e4crypt_policy_get" am:
6c26bba8a9 am:
6c0637a8f5
am:
7e9786d791
Change-Id: I390299006a0af18ac819afe8e1fbfce9c9c2d475
Ethan Yonker [Wed, 7 Dec 2016 19:34:48 +0000 (19:34 +0000)]
Merge "ext4_utils: Fix return value in e4crypt_policy_get" am:
6c26bba8a9
am:
6c0637a8f5
Change-Id: Icad05c70cdf415c790d8fb0168732a1889ea1a26
Ethan Yonker [Wed, 7 Dec 2016 19:31:17 +0000 (19:31 +0000)]
Merge "ext4_utils: Fix return value in e4crypt_policy_get"
am:
6c26bba8a9
Change-Id: I24e845592c4d169a4817a0a034399c381e898d75
Treehugger Robot [Wed, 7 Dec 2016 19:26:30 +0000 (19:26 +0000)]
Merge "ext4_utils: Fix return value in e4crypt_policy_get"
Ethan Yonker [Wed, 7 Dec 2016 04:42:14 +0000 (22:42 -0600)]
ext4_utils: Fix return value in e4crypt_policy_get
Change-Id: I9e02cda707b551980683895ef7f22522157628d8
Pat Tjin [Wed, 7 Dec 2016 07:24:18 +0000 (07:24 +0000)]
Merge "make_ext4fs: add option to specify the number of inodes" am:
33d9ecbf96 am:
9db54ab7b3 am:
3b9050c80b
am:
fc541d67d8
Change-Id: Ic5b500f5c0a7c622981a64a2e9e6f4f6e0960a6f
Pat Tjin [Wed, 7 Dec 2016 07:20:18 +0000 (07:20 +0000)]
Merge "make_ext4fs: add option to specify the number of inodes" am:
33d9ecbf96 am:
9db54ab7b3
am:
3b9050c80b
Change-Id: Ie956b07d01af76f9d020c834078615963ed32404
Pat Tjin [Wed, 7 Dec 2016 07:15:47 +0000 (07:15 +0000)]
Merge "make_ext4fs: add option to specify the number of inodes" am:
33d9ecbf96
am:
9db54ab7b3
Change-Id: Iceb76b0636157932347bb52de827f398e21f2766
Pat Tjin [Wed, 7 Dec 2016 07:12:14 +0000 (07:12 +0000)]
Merge "make_ext4fs: add option to specify the number of inodes"
am:
33d9ecbf96
Change-Id: I88c802988fc17afcc7274be12940295e0987e341
Pat Tjin [Wed, 7 Dec 2016 07:07:25 +0000 (07:07 +0000)]
Merge "make_ext4fs: add option to specify the number of inodes"
Patrick Tjin [Thu, 20 Oct 2016 17:55:11 +0000 (10:55 -0700)]
make_ext4fs: add option to specify the number of inodes
Add option to specify the number of inodes to create when
making the filesystem. Read-only partitions don't have
a need for extra inodes, a lot of space is wasted by these
inodes.
Bug:
32246383
Test: make vendor partition with new options
Change-Id: I7063972ec4f4e617d28d2e029ad6a9f8e94add73
(cherry picked from commit
15c434682ac78262d2dad9730805eab52b748cdf)
Yabin Cui [Sat, 3 Dec 2016 04:51:59 +0000 (04:51 +0000)]
Merge "simpleperf: add binary_cache_builder script." am:
a5a101294e am:
7b4295f4ab am:
5564824d90
am:
b2cd58e7d7
Change-Id: I184671b3d142cf9425bb29b1276664c29e8c1538
Yabin Cui [Sat, 3 Dec 2016 04:43:33 +0000 (04:43 +0000)]
Merge "simpleperf: add binary_cache_builder script." am:
a5a101294e am:
7b4295f4ab
am:
5564824d90
Change-Id: Ie5834ce95e03799c641405b93a7d7e8f4940b9d9
Yabin Cui [Sat, 3 Dec 2016 04:37:47 +0000 (04:37 +0000)]
Merge "simpleperf: add binary_cache_builder script." am:
a5a101294e
am:
7b4295f4ab
Change-Id: Ife23eed139391475b0b00ac86c77c993a5c471d3
Yabin Cui [Sat, 3 Dec 2016 04:23:48 +0000 (04:23 +0000)]
Merge "simpleperf: add binary_cache_builder script."
am:
a5a101294e
Change-Id: I0c2a0c8037cd95e25dab555e9c348ab7270cfaf7
Adrien Schildknecht [Sat, 3 Dec 2016 04:20:11 +0000 (04:20 +0000)]
Manually merge commit '
bf03f2e' into stage-aosp-master am:
a083ba6a48 am:
298394ac68
am:
822c2b6e07
Change-Id: I3682e1a156e0c5740b57f51a42c5d2b3f96f92a8
Adrien Schildknecht [Sat, 3 Dec 2016 04:15:07 +0000 (04:15 +0000)]
Manually merge commit '
bf03f2e' into stage-aosp-master am:
a083ba6a48
am:
298394ac68
Change-Id: I21a5898232427ee759f33f53bd1c5c96f4cc5439
Adrien Schildknecht [Sat, 3 Dec 2016 04:13:08 +0000 (04:13 +0000)]
Manually merge commit '
bf03f2e' into stage-aosp-master
am:
a083ba6a48
Change-Id: I62ac977e4352061f3d3b7aecbf7dcfbc6026d32a
The Android Automerger [Sat, 3 Dec 2016 04:08:00 +0000 (04:08 +0000)]
Manually merge commit '
bf03f2e' into stage-aosp-master
* commit '
bf03f2e':
ext4_utils: move ext2simg to upstream e2fsprogs
ext4_utils: use mke2fs instead of make_ext4
BUG:
33304034
Yabin Cui [Fri, 2 Dec 2016 23:38:49 +0000 (23:38 +0000)]
Merge "simpleperf: add binary_cache_builder script."
Treehugger Robot [Fri, 2 Dec 2016 22:48:21 +0000 (22:48 +0000)]
Merge changes from topic 'e2fsprogs'
* changes:
ext4_utils: move ext2simg to upstream e2fsprogs
ext4_utils: use mke2fs instead of make_ext4
Yabin Cui [Wed, 30 Nov 2016 19:46:20 +0000 (11:46 -0800)]
simpleperf: add binary_cache_builder script.
To report on host, we need to pull binaries from device to host.
binary_cache_builder.py is used to pull needed binaries automatically.
Other changes:
Move common functions to utils.py.
Move libsimpleperf_report.so to proper directory, so we can add other
host shared libraries and target binaries in the future.
Bug: http://b/
32834638
Test: run binary_cache_builder.py for N, O devices, both root and non-root.
Change-Id: Ifa8931842087ed43d1e530e40ca0254cbf9ea3a9
Adrien Schildknecht [Thu, 1 Dec 2016 23:10:09 +0000 (15:10 -0800)]
ext4_utils: move ext2simg to upstream e2fsprogs
This binary is now part of e2fsprogs.
Test: m ext2simg
Change-Id: I6c30cc7d6c79770541c13c84449e35bbca8b5541
Adrien Schildknecht [Wed, 16 Nov 2016 06:33:29 +0000 (22:33 -0800)]
ext4_utils: use mke2fs instead of make_ext4
Test: m -j32 && fastboot flashall (aosp_angler-userdebug)
Change-Id: Ic4f598fdf19c8d6fb44740999663ed4f166b0a5b
gitbuildkicker [Thu, 1 Dec 2016 00:57:20 +0000 (16:57 -0800)]
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev
Yabin Cui [Wed, 30 Nov 2016 20:05:31 +0000 (20:05 +0000)]
Merge "simpleperf: improve script interface." am:
090785e4dd am:
72fc75c1f7 am:
bb4366201f
am:
22570fa2ec
Change-Id: Id9f23a2389b957833a9df376ea50bbb4261e209e
Connor O'Brien [Wed, 30 Nov 2016 20:05:20 +0000 (20:05 +0000)]
Merge "Rewrite bootctl utility to use new HAL interface" am:
1bc97843cb am:
fe9d980924 am:
72332cb51b
am:
75e2751488
Change-Id: I6a5f511ee6de34d1138446e17ef6c98c2eec3829
Yabin Cui [Wed, 30 Nov 2016 20:00:34 +0000 (20:00 +0000)]
Merge "simpleperf: improve script interface." am:
090785e4dd am:
72fc75c1f7
am:
bb4366201f
Change-Id: Ie4e2840c333565b2df03d2ee508ecf1755aa3126
Connor O'Brien [Wed, 30 Nov 2016 20:00:19 +0000 (20:00 +0000)]
Merge "Rewrite bootctl utility to use new HAL interface" am:
1bc97843cb am:
fe9d980924
am:
72332cb51b
Change-Id: I5943d75aa91755f9f1d0e1c28ea308f8aaeab4c5
Yabin Cui [Wed, 30 Nov 2016 19:55:30 +0000 (19:55 +0000)]
Merge "simpleperf: improve script interface." am:
090785e4dd
am:
72fc75c1f7
Change-Id: Ia7c9cc81aa76c4b4f465cf5a6b33884e2c5493fa
Connor O'Brien [Wed, 30 Nov 2016 19:55:19 +0000 (19:55 +0000)]
Merge "Rewrite bootctl utility to use new HAL interface" am:
1bc97843cb
am:
fe9d980924
Change-Id: Icb27cd3a4e99394eab7754eda9b22d23988b3a0f
Yabin Cui [Wed, 30 Nov 2016 19:49:51 +0000 (19:49 +0000)]
Merge "simpleperf: improve script interface."
am:
090785e4dd
Change-Id: I6536a2764eed1b614628028fccb6a79477208268
Connor O'Brien [Wed, 30 Nov 2016 19:49:37 +0000 (19:49 +0000)]
Merge "Rewrite bootctl utility to use new HAL interface"
am:
1bc97843cb
Change-Id: I99deaf99e0f747ac75f53a03b1e85414228ed715
Yabin Cui [Wed, 30 Nov 2016 19:39:53 +0000 (19:39 +0000)]
Merge "simpleperf: improve script interface."
Connor O'Brien [Wed, 30 Nov 2016 19:33:34 +0000 (19:33 +0000)]
Merge "Rewrite bootctl utility to use new HAL interface"
Yabin Cui [Wed, 30 Nov 2016 18:10:33 +0000 (18:10 +0000)]
Merge "simpleperf: fix tests for dwarf callgraph unwinding." am:
35f8849075 am:
ed3ee52f81 am:
fe39f81b95
am:
9623e09ae5
Change-Id: I96bc3345e092be4b9e29c3928de5286630c88e72