OSDN Git Service
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
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 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: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: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 [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 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: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: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: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: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: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: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: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 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:00:29 +0000 (18:00 +0000)]
Merge "simpleperf: fix tests for dwarf callgraph unwinding." am:
35f8849075
am:
ed3ee52f81
Change-Id: I3ed2e28943962ea330ccd4b46c7a432272f16012
Yabin Cui [Wed, 30 Nov 2016 17:54:55 +0000 (17:54 +0000)]
Merge "simpleperf: fix tests for dwarf callgraph unwinding."
am:
35f8849075
Change-Id: I4329e4c23a5c20e3b13749fcf13ba5bd82ae645e
Yabin Cui [Wed, 30 Nov 2016 17:41:27 +0000 (17:41 +0000)]
Merge "simpleperf: fix tests for dwarf callgraph unwinding."
Yabin Cui [Tue, 29 Nov 2016 20:54:50 +0000 (12:54 -0800)]
simpleperf: improve script interface.
1. In ReportLib, return structure instead of pointer to structure.
So users can use 'sample' instead of 'sample[0]', as in report_sample.py.
2. For python3, convert char pointer to str type. Because str is more
convenient to use.
Bug: http://b/
32834638
Test: run simpleperf_report_lib.py and report_sample.py.
Change-Id: Iee8c3570e82104c5dd02f3f657ac143d1fdc2233
Connor O'Brien [Fri, 14 Oct 2016 22:03:12 +0000 (15:03 -0700)]
Rewrite bootctl utility to use new HAL interface
Test: Ran and compared output to old version
Change-Id: I8889794a5c7953b066a1a7fecd0154c912f4d60d
Signed-off-by: Connor O'Brien <connoro@google.com>
Yabin Cui [Tue, 29 Nov 2016 23:21:13 +0000 (15:21 -0800)]
simpleperf: fix tests for dwarf callgraph unwinding.
32-bit simpleperf can't unwind a 64-bit `sleep` process in aarch64
environment. It makes following error in tests:
simpleperf is built in arch arm, and can't do stack unwinding for arch arm64
So make the workload be able to start a process
running callback function. By profiling that process, we can
guarantee that 32-bit simpleperf is profiling a 32-bit process.
Also fix a flaky test IOEventLoop.signal.
Build 32-bit simpleperf_unit_test on 64-bit devices.
Bug: http://b/
33167911
Test: run simpleperf_unit_test.
Change-Id: I82741dc5d90c73c1890f834d8e2a9188421a3828
Yabin Cui [Tue, 29 Nov 2016 19:57:23 +0000 (19:57 +0000)]
Merge "simpleperf: add stuff in report_lib_interface." am:
c11a58e701
am:
016ac14879
Change-Id: Iabbcd190c4b94518fa15b5abd1a932063104aece
Yabin Cui [Tue, 29 Nov 2016 19:51:53 +0000 (19:51 +0000)]
Merge "simpleperf: add stuff in report_lib_interface."
am:
c11a58e701
Change-Id: I6fcdd9b4476d927298f419cee37aaf46c4c0ed2e
Yabin Cui [Tue, 29 Nov 2016 19:46:07 +0000 (19:46 +0000)]
Merge "simpleperf: add stuff in report_lib_interface."
Tao Bao [Tue, 29 Nov 2016 18:19:04 +0000 (18:19 +0000)]
DO NOT MERGE verity_verifier: Support verifying images with FEC. am:
989f6a13a7 am:
533ed53bc0 am:
3734580187
am:
69dd400b72 -s ours
Change-Id: I4bb866122631ea580cd1811dc4b7e3f5138a2140
Tao Bao [Tue, 29 Nov 2016 18:09:11 +0000 (18:09 +0000)]
DO NOT MERGE verity_verifier: Support verifying images with FEC. am:
989f6a13a7 am:
533ed53bc0
am:
3734580187
Change-Id: Id3fd5d9611e86735f5cb54f7888048ff7c108f3b
Tao Bao [Tue, 29 Nov 2016 18:04:10 +0000 (18:04 +0000)]
DO NOT MERGE verity_verifier: Support verifying images with FEC. am:
989f6a13a7
am:
533ed53bc0
Change-Id: I1eca68a42d8c935f95e6dbeadd8e52ca5df48d01
Tao Bao [Tue, 29 Nov 2016 17:59:10 +0000 (17:59 +0000)]
DO NOT MERGE verity_verifier: Support verifying images with FEC.
am:
989f6a13a7
Change-Id: I7e9bebaafac56456c618befee18f971114e24b85
Mark Salyzyn [Tue, 29 Nov 2016 17:54:46 +0000 (17:54 +0000)]
Merge changes I2198f8b5,I245c859e am:
c3fbd8b936
am:
af3938ae34
Change-Id: I9092e5733eb6e861ed7631e77ea6968260159de8
Mark Salyzyn [Tue, 29 Nov 2016 17:54:44 +0000 (17:54 +0000)]
time test reclassification as gTest am:
11a438be18
am:
0ceab28690
Change-Id: I8ad8fef52e2949319b3bab0c5cf9e7275560e9d9
Mark Salyzyn [Tue, 29 Nov 2016 17:54:41 +0000 (17:54 +0000)]
system/extras: Replace cutils/log.h with android/log.h or log/log.h am:
3d66aa307e
am:
55925a0a50
Change-Id: I763b2d935997e0c125d60f474afe699260c7014c
Mark Salyzyn [Tue, 29 Nov 2016 17:50:14 +0000 (17:50 +0000)]
Merge changes I2198f8b5,I245c859e
am:
c3fbd8b936
Change-Id: I8a765ad6d12ea8450fba6f229e564b0a40007c15
Mark Salyzyn [Tue, 29 Nov 2016 17:50:13 +0000 (17:50 +0000)]
time test reclassification as gTest
am:
11a438be18
Change-Id: I06539c7e894be9a1739779f97fb31ec6f1e672b1
Mark Salyzyn [Tue, 29 Nov 2016 17:50:12 +0000 (17:50 +0000)]
system/extras: Replace cutils/log.h with android/log.h or log/log.h
am:
3d66aa307e
Change-Id: Ifa46c3083140959b0cd1f27a96de7826a3413205
Yabin Cui [Tue, 29 Nov 2016 01:28:08 +0000 (17:28 -0800)]
simpleperf: add stuff in report_lib_interface.
It's a preparation to annotate binaries, containing following
changes:
1. Export build_id for binaries.
2. Export function virtual addresses.
3. Add unit tests in simpleperf_report_lib.py.
Bug: http://b/
32834638
Test: simpleperf_unit_test.
Test: run `python simpleperf_report_lib.py`.
Change-Id: Ieed40935ff9ede44bf823ba9c88ad87806ffac0a
Treehugger Robot [Tue, 29 Nov 2016 17:42:28 +0000 (17:42 +0000)]
Merge changes I2198f8b5,I245c859e
* changes:
time test reclassification as gTest
system/extras: Replace cutils/log.h with android/log.h or log/log.h
Sami Tolvanen [Tue, 29 Nov 2016 00:05:54 +0000 (00:05 +0000)]
DO NOT MERGE: libfec: allow fec_header to be located anywhere
am:
549f048fcb
Change-Id: I1c0403a1449d5c6208f8b7330d7d12da7bac7df2
Sami Tolvanen [Tue, 29 Nov 2016 00:05:52 +0000 (00:05 +0000)]
DO NOT MERGE: fec: add --padding
am:
61fce29c45
Change-Id: I7c72ae76f73d5c8c48220f6f606722e3b1cd8287
Sami Tolvanen [Tue, 29 Nov 2016 00:05:48 +0000 (00:05 +0000)]
DO NOT MERGE: fec: remove unneeded target executable
am:
955d3afe95 -s ours
Change-Id: I10e0bc8cd075eb24a98e21916202c529f513943d
Sami Tolvanen [Tue, 29 Nov 2016 00:05:44 +0000 (00:05 +0000)]
DO NOT MERGE: fec: remove unused mmap code
am:
cace33a52a -s ours
Change-Id: I2a0e781693aa7849ddae32fab13b143ca198a242
Tao Bao [Mon, 28 Nov 2016 22:16:10 +0000 (22:16 +0000)]
build_verity_metadata: Support --signer_args argument. am:
1522691d1d am:
c2e9c0f0fc am:
c681cb32b3
am:
b91b1cd229 -s ours
Change-Id: I215a06b68f54322c4b7b2966d7f6ca626f6d7a66
Yabin Cui [Wed, 23 Nov 2016 01:41:57 +0000 (01:41 +0000)]
Merge "simpleperf: fix a check error." am:
89bf4d4276
am:
a2f8d9cbbd
Change-Id: Ia2b9084cc471eab895db31a509e73eb30234d441
Yabin Cui [Wed, 23 Nov 2016 01:39:28 +0000 (01:39 +0000)]
Merge "simpleperf: fix a check error."
am:
89bf4d4276
Change-Id: I4478c64282ab9804f1790fee7e1a6609478562d2
Yabin Cui [Wed, 23 Nov 2016 01:36:35 +0000 (01:36 +0000)]
Merge "simpleperf: fix a check error."
Yabin Cui [Tue, 22 Nov 2016 23:32:03 +0000 (15:32 -0800)]
simpleperf: fix a check error.
Bug: None.
Test: `simpleperf record` a sleep process.
Change-Id: I334e9fb857743c63bf0a0b4b50f1a723d47ba6e7
Tao Bao [Tue, 18 Oct 2016 20:02:14 +0000 (13:02 -0700)]
DO NOT MERGE verity_verifier: Support verifying images with FEC.
The current VerityVerifier.jar cannot verify verity images with FEC
metadata (since N). Replace it with a new verity verifier that uses
libfec to parse and verify verity metadata.
It accepts the same command line arguments as the old verity_verifier
script.
Usage: verity_verifier <image> -mincrypt <verity_key>
image the image file (raw or sparse image) to be verified
verity_key the verity key in mincrypt format (/verity_key on device)
Note: this is a backport of commit
bb634ff8dab6327bd38eadee22d5f8ec9d3940d0. It uses the mincrypt headers
and functions instead.
Bug:
32173582
Test: $ verity_verifier $OUT/system.img -mincrypt $OUT/root/verity_key
VERIFIED
Change-Id: I8624973715dcd0f6d89d408c1c97bf584b50ce06
(cherry picked from commit
bb634ff8dab6327bd38eadee22d5f8ec9d3940d0)
Mark Salyzyn [Tue, 22 Nov 2016 19:07:22 +0000 (19:07 +0000)]
Merge "cts: android.kernel.config drop v2" am:
edb18846b8
am:
377daa8c61
Change-Id: Ifcc90e269e8cd00353457907159c2a2887a1688a
Mark Salyzyn [Tue, 22 Nov 2016 19:04:54 +0000 (19:04 +0000)]
Merge "cts: android.kernel.config drop v2"
am:
edb18846b8
Change-Id: I5c74eb13ccfe2a475dbad0cb66dadde38d8d5249
Mark Salyzyn [Tue, 22 Nov 2016 19:01:23 +0000 (19:01 +0000)]
Merge "cts: android.kernel.config drop v2"
Mark Salyzyn [Thu, 14 Jan 2016 17:20:47 +0000 (09:20 -0800)]
time test reclassification as gTest
Test: compile
Bug:
26559308
Change-Id: I2198f8b580f5302bd3ca015a86fcd04e680765ee
Mark Salyzyn [Thu, 29 Sep 2016 17:50:27 +0000 (10:50 -0700)]
system/extras: Replace cutils/log.h with android/log.h or log/log.h
Test: build success
Bug:
26552300
Bug:
31289077
Change-Id: I245c859eae366f817f883e74717bb04050196b4e
Mark Salyzyn [Mon, 4 Apr 2016 14:37:27 +0000 (07:37 -0700)]
cts: android.kernel.config drop v2
Test: cts: android.kernel.config
Bug:
19173869
Change-Id: If5c600ad7d261d94d424ae948314fec79bd69828
Dimitry Ivanov [Tue, 22 Nov 2016 02:13:14 +0000 (02:13 +0000)]
Merge "Remove unnecessary reinterpret_cast" am:
71a681b891
am:
b01eb15e91
Change-Id: Id3cd5da8790f07af8a1e2d440ba4e31828aa0fb0