OSDN Git Service
Yabin Cui [Thu, 27 Oct 2016 16:44:29 +0000 (16:44 +0000)]
Merge "simpleperf: reduce default test log output." am:
bd0935dc79 am:
5f94c4360e
am:
dcc1434a41
Change-Id: I5ab77a6aeb5e96907604b975c627207940871f26
Yabin Cui [Thu, 27 Oct 2016 16:39:59 +0000 (16:39 +0000)]
Merge "simpleperf: reduce default test log output." am:
bd0935dc79
am:
5f94c4360e
Change-Id: I00523a8f65c385541534de4d7177b8fef8e18a5c
Yabin Cui [Thu, 27 Oct 2016 16:35:28 +0000 (16:35 +0000)]
Merge "simpleperf: reduce default test log output."
am:
bd0935dc79
Change-Id: I0a1da4d0d98e828f7923c9f79da832f89001d0b6
Yabin Cui [Thu, 27 Oct 2016 16:26:00 +0000 (16:26 +0000)]
Merge "simpleperf: reduce default test log output."
Yabin Cui [Wed, 26 Oct 2016 23:17:25 +0000 (16:17 -0700)]
simpleperf: reduce default test log output.
Bug: http://b/
32442055
Test: run simpleperf_cpu_hotplug_test.
Change-Id: I179a83cec98c6a32bdc9ba8ad403c199a8009f80
Tao Bao [Wed, 26 Oct 2016 22:50:11 +0000 (15:50 -0700)]
resolve merge conflicts of
303a851 to nyc-mr2-dev-plus-aosp
Change-Id: I2c128766ccab4c21ef87b0b87c6b6a517e9280b2
Tao Bao [Wed, 26 Oct 2016 22:27:01 +0000 (22:27 +0000)]
build_verity_metadata: Support --signer_args argument. am:
1522691d1d am:
c2e9c0f0fc am:
c681cb32b3
am:
b91b1cd229
Change-Id: I2fdccda3685d5c255dda29680aa1f9ea7629fd47
Tao Bao [Wed, 26 Oct 2016 22:23:00 +0000 (22:23 +0000)]
build_verity_metadata: Support --signer_args argument. am:
1522691d1d am:
c2e9c0f0fc
am:
c681cb32b3
Change-Id: Ifdaf37a7a04172798ce3ab125c799c819f350de3
Tao Bao [Wed, 26 Oct 2016 22:18:30 +0000 (22:18 +0000)]
build_verity_metadata: Support --signer_args argument. am:
1522691d1d
am:
c2e9c0f0fc
Change-Id: Id0290ac657b6ebd1c6ec59f6ac5f44cd3806d5d7
Tao Bao [Wed, 26 Oct 2016 22:13:29 +0000 (22:13 +0000)]
build_verity_metadata: Support --signer_args argument.
am:
1522691d1d
Change-Id: I9827575704475f3781a214ab73a3b82b7bd00e38
Tianjie Xu [Wed, 26 Oct 2016 20:48:21 +0000 (20:48 +0000)]
Merge "Convert verity tools to subprocess" am:
6a28545530 am:
78e22d339a
am:
dcdb27f81b
Change-Id: Ie5a01d286f5e992de853faecdddaec597525d940
Tianjie Xu [Wed, 26 Oct 2016 20:44:20 +0000 (20:44 +0000)]
Merge "Convert verity tools to subprocess" am:
6a28545530
am:
78e22d339a
Change-Id: Ibbc05ce648c0650cd77af6bf6d77ac1b1908f658
Tianjie Xu [Wed, 26 Oct 2016 20:40:21 +0000 (20:40 +0000)]
Merge "Convert verity tools to subprocess"
am:
6a28545530
Change-Id: I640228fc63e3bbe56d0d101a7cda5702266dc8f2
Tianjie Xu [Wed, 26 Oct 2016 20:34:23 +0000 (20:34 +0000)]
Merge "Convert verity tools to subprocess"
Tianjie Xu [Wed, 26 Oct 2016 01:11:24 +0000 (18:11 -0700)]
Convert verity tools to subprocess
Convert build_verity_metadata.py to subprocess instead of commands
module.
Bug:
31500725
Test: build_verity_metadata.py executes successfully
Change-Id: I9a0db78390d330710e62a710f8f957743aebd822
Pirama Arumuga Nainar [Wed, 26 Oct 2016 18:09:51 +0000 (18:09 +0000)]
Merge "Make simpleperf build with LLVM r275480" am:
c27cccb8ef am:
5c5e17693f
am:
9b1b5fe95e
Change-Id: Ie147fd78a66223cac739e5d8bb97f4c1e3151796
Pirama Arumuga Nainar [Wed, 26 Oct 2016 17:57:51 +0000 (17:57 +0000)]
Merge "Make simpleperf build with LLVM r275480" am:
c27cccb8ef
am:
5c5e17693f
Change-Id: Ife2ad29270cac3a8ec041b7c1e7908f74ed7c8a5
Pirama Arumuga Nainar [Wed, 26 Oct 2016 17:45:47 +0000 (17:45 +0000)]
Merge "Make simpleperf build with LLVM r275480"
am:
c27cccb8ef
Change-Id: Icd9afadf40fff33c7a70a5600c7130811b5a6046
Tao Bao [Wed, 26 Oct 2016 17:36:30 +0000 (17:36 +0000)]
Merge "Support verifying the boot signature against the given pubkey." am:
a422392dbd am:
eec8371fa1
am:
838c8b7729
Change-Id: Ia6acea16a7544d6a63ed9a0135618953762588ed
Pirama Arumuga Nainar [Wed, 26 Oct 2016 17:35:50 +0000 (17:35 +0000)]
Merge "Make simpleperf build with LLVM r275480"
Tao Bao [Wed, 26 Oct 2016 17:32:29 +0000 (17:32 +0000)]
Merge "Support verifying the boot signature against the given pubkey." am:
a422392dbd
am:
eec8371fa1
Change-Id: I68e0e2339425131c4f5149c5dca859a90224f76f
Tao Bao [Wed, 26 Oct 2016 17:28:32 +0000 (17:28 +0000)]
Merge "Support verifying the boot signature against the given pubkey."
am:
a422392dbd
Change-Id: I3a13f72440eb35f7f3b43e64424100b88dfa1324
Treehugger Robot [Wed, 26 Oct 2016 17:17:36 +0000 (17:17 +0000)]
Merge "Support verifying the boot signature against the given pubkey."
Pirama Arumuga Nainar [Fri, 16 Sep 2016 23:53:25 +0000 (16:53 -0700)]
Make simpleperf build with LLVM r275480
Bug: http://b/
31320715
Test: simpleperf_unit_test on host and target
Change-Id: I3b81884af6dc7371a91d1cd34b777e952e6c9d6b
Tao Bao [Mon, 17 Oct 2016 23:06:31 +0000 (16:06 -0700)]
build_verity_metadata: Support --signer_args argument.
Use argparse to parse input parameters for future extension.
Add 'build' and 'size' as two sub-commands.
- 'build_verity_metadata.py -s SIZE' becomes
'build_verity_metadata.py size SIZE'.
- 'build_verity_metadata.py BLOCKS METADATA_IMAGE ...' becomes
'build_verity_metadata.py build BLOCKS METADATA_IMAGE ...'.
The 'build' command now accepts an optional argument '--signer_args' to
specify signer specific arguments.
Bug:
31500665
Test: Building and signing work w/ and w/o --signer_args.
Change-Id: I3cfd2b584efad216b91d5fcd0314f4468ff7450f
(cherry picked from commit
39d1756abe66538a6cbdfc4c7b5377ce279e332c)
Yabin Cui [Tue, 25 Oct 2016 19:29:33 +0000 (19:29 +0000)]
Merge "simpleperf: use Dso::IsHit() to mark hit binaries." am:
e7448f00cf am:
d8cbb4dbfe
am:
fae3f6b6c8
Change-Id: I568f2f18f092fe3282ee1be7bc00940ead43f25f
Yabin Cui [Tue, 25 Oct 2016 19:25:02 +0000 (19:25 +0000)]
Merge "simpleperf: use Dso::IsHit() to mark hit binaries." am:
e7448f00cf
am:
d8cbb4dbfe
Change-Id: Iaa908749aad9909c9cf138565ede09ff2a7571ac
Yabin Cui [Tue, 25 Oct 2016 19:20:35 +0000 (19:20 +0000)]
Merge "simpleperf: use Dso::IsHit() to mark hit binaries."
am:
e7448f00cf
Change-Id: I760b58b78598154262e49ee185ce54f5bade7646
Yabin Cui [Tue, 25 Oct 2016 19:15:54 +0000 (19:15 +0000)]
Merge "simpleperf: use Dso::IsHit() to mark hit binaries."
Yabin Cui [Mon, 24 Oct 2016 21:09:26 +0000 (14:09 -0700)]
simpleperf: use Dso::IsHit() to mark hit binaries.
Bug: http://b/
32340274
Test: simpleperf_unit_test.
Change-Id: I074973cdc0420d28c7dfcaca80e477234bceec95
Michael Schwartz [Tue, 25 Oct 2016 15:43:08 +0000 (15:43 +0000)]
Merge "Remove unused dependencies" am:
1a62169e96 am:
036879c96d
am:
8d5fd46b60
Change-Id: Iea363f0a123f7879ae028b7f6ce76cecee68509b
Michael Schwartz [Tue, 25 Oct 2016 15:39:38 +0000 (15:39 +0000)]
Merge "Remove unused dependencies" am:
1a62169e96
am:
036879c96d
Change-Id: Iaad4411996c82777b77825d0267ac9526d4e955e
Michael Schwartz [Tue, 25 Oct 2016 15:35:38 +0000 (15:35 +0000)]
Merge "Remove unused dependencies"
am:
1a62169e96
Change-Id: I5a6de85a7fb00ec8ecb9913dbc077046e3842bed
Michael Schwartz [Tue, 25 Oct 2016 15:31:40 +0000 (15:31 +0000)]
Merge "Remove unused dependencies"
Michael Schwartz [Tue, 18 Oct 2016 17:36:50 +0000 (10:36 -0700)]
Remove unused dependencies
Bug:
32208916
Test: Builds on bullhead_treble-userdebug
Change-Id: I0933d2289a534c5260ad1826d88007ec7e4e5f43
Tao Bao [Mon, 24 Oct 2016 19:00:23 +0000 (19:00 +0000)]
Merge "build_verity_metadata: Support --signer_args argument." am:
58117c6714 am:
949aa8c79b
am:
72a8037127
Change-Id: I6f3331f05e5c84f2a54cb313531844266bc250ee
Tao Bao [Mon, 24 Oct 2016 18:56:52 +0000 (18:56 +0000)]
Merge "build_verity_metadata: Support --signer_args argument." am:
58117c6714
am:
949aa8c79b
Change-Id: I5868a960f08bfb7b4c595d1aec53f1a508c26b2a
Tao Bao [Mon, 24 Oct 2016 18:53:25 +0000 (18:53 +0000)]
Merge "build_verity_metadata: Support --signer_args argument."
am:
58117c6714
Change-Id: Ic4c05c49a59f757d8395dd0b611081b64dd7812e
Tao Bao [Mon, 24 Oct 2016 18:50:14 +0000 (18:50 +0000)]
Merge "build_verity_metadata: Support --signer_args argument."
Yabin Cui [Mon, 24 Oct 2016 18:44:59 +0000 (18:44 +0000)]
Merge "simpleperf: fix dumping build id." am:
6f5984af9e am:
ce69042ed2
am:
b7e69fb251
Change-Id: I6edf3e87dcf56a0ba5f90276f7f7e5f38f157b9e
Yabin Cui [Mon, 24 Oct 2016 18:40:57 +0000 (18:40 +0000)]
Merge "simpleperf: fix dumping build id." am:
6f5984af9e
am:
ce69042ed2
Change-Id: I9770d8c91e396512ce93de44ae584e5a7ff18fe7
Yabin Cui [Mon, 24 Oct 2016 18:34:19 +0000 (18:34 +0000)]
Merge "simpleperf: fix dumping build id."
am:
6f5984af9e
Change-Id: I65cac87bd8179a4f2f827d6fdb7b65059f91182d
Yabin Cui [Mon, 24 Oct 2016 18:25:12 +0000 (18:25 +0000)]
Merge "simpleperf: fix dumping build id."
Yabin Cui [Sat, 22 Oct 2016 02:16:51 +0000 (19:16 -0700)]
simpleperf: fix dumping build id.
1. Dump build id for binaries hit by callchain ips.
2. Fix a memory used after free bug in ReadBuildIdFeature().
Bug: http://b/
32340274
Test: simpleperf_unit_test.
Test: check output of `simpleperf dump` manually.
Change-Id: I0132e5ce0e06096413231325e9f1d215143eedd2
Yabin Cui [Thu, 20 Oct 2016 23:34:35 +0000 (23:34 +0000)]
Merge "simpleperf: support building sample record manually." am:
9ffbb8321e
am:
2b7704df9b
Change-Id: I15157f5ad0ddd9194170f84c8a0e9425daba886a
Yabin Cui [Thu, 20 Oct 2016 23:28:24 +0000 (23:28 +0000)]
Merge "simpleperf: support building sample record manually."
am:
9ffbb8321e
Change-Id: I481bced683d416e18edeb029ec9799ff17cfc508
Yabin Cui [Thu, 20 Oct 2016 23:18:53 +0000 (23:18 +0000)]
Merge "simpleperf: support building sample record manually."
Sami Tolvanen [Thu, 20 Oct 2016 18:28:28 +0000 (18:28 +0000)]
Merge "libfec: correct verity table only if it's invalid" am:
3e8eb43762
am:
2e4e1b54bf
Change-Id: I012984f99b42fc9e99465256a2c43557a6c4a507
Sami Tolvanen [Thu, 20 Oct 2016 18:20:29 +0000 (18:20 +0000)]
Merge "libfec: correct verity table only if it's invalid"
am:
3e8eb43762
Change-Id: I1d7716265ec80373fea1e6ed3127f526e8de0545
Treehugger Robot [Thu, 20 Oct 2016 18:16:52 +0000 (18:16 +0000)]
Merge "libfec: correct verity table only if it's invalid"
Yabin Cui [Wed, 19 Oct 2016 18:28:48 +0000 (11:28 -0700)]
simpleperf: support building sample record manually.
And other small changes:
add time when building comm record.
move some Move*BinaryFormat to utils.h.
Handle wrong symbol whoes address can be ULLONG_MAX.
Bug: http://b/
30974760
Test: simpleperf_unit_test.
Change-Id: I2956d3c4b781c580fe93a6e5b77e0469f7f4f43f
Yabin Cui [Thu, 20 Oct 2016 17:32:07 +0000 (17:32 +0000)]
Merge "simpleperf: add functions to IOEventLoop." am:
ed2e8624ef
am:
3effb0acd7
Change-Id: I5eaee177392634e9848d775436b5217527077018
Yabin Cui [Thu, 20 Oct 2016 17:31:32 +0000 (17:31 +0000)]
Merge "Simpleperf: add --max-stack and --percent-limit options for report cmd." am:
4b76b29dc1
am:
633fa10b26
Change-Id: I71640eff824d7958054c087e67e2e3298e1173e6
Yabin Cui [Thu, 20 Oct 2016 17:23:31 +0000 (17:23 +0000)]
Merge "simpleperf: add functions to IOEventLoop."
am:
ed2e8624ef
Change-Id: I156f0396dd6b7c80a1bcc6e22101149a32df6f0d
Yabin Cui [Thu, 20 Oct 2016 17:22:59 +0000 (17:22 +0000)]
Merge "Simpleperf: add --max-stack and --percent-limit options for report cmd."
am:
4b76b29dc1
Change-Id: I08c43de0ae179f2c274165c60f8302ed5d3d92e6
Yabin Cui [Thu, 20 Oct 2016 17:18:51 +0000 (17:18 +0000)]
Merge "simpleperf: add functions to IOEventLoop."
Yabin Cui [Thu, 20 Oct 2016 17:18:35 +0000 (17:18 +0000)]
Merge "Simpleperf: add --max-stack and --percent-limit options for report cmd."
Sami Tolvanen [Wed, 19 Oct 2016 22:58:13 +0000 (15:58 -0700)]
libfec: correct verity table only if it's invalid
To increase reliability in the case where part of the partition is
corrupt and error correction might fail, attempt to use raw verity
table before the corrected one.
Bug:
32288104
Test: tested on angler
Change-Id: I201fdc6162c87b1808979486df5707d683a6d20c
Yabin Cui [Thu, 29 Sep 2016 22:59:33 +0000 (15:59 -0700)]
Simpleperf: add --max-stack and --percent-limit options for report cmd.
Bug: http://b/
24905115
Test: run simpleperf-unit-test.
Change-Id: I177f618f923f90069c0380063f0c3f93427dedd7
Tao Bao [Wed, 19 Oct 2016 21:59:31 +0000 (14:59 -0700)]
Support verifying the boot signature against the given pubkey.
verify_boot_signature currently verifies the signature in the boot image
(against the certificate embedded in the image).
This CL supports additionally verifying the signature against the given
OEM pubkey (a fixed, tamper-protected key available to the bootloader).
Usage: verify_boot_signature <path-to-boot-image>
verify_boot_signature <path-to-boot-image> <pubkey>
- Locally built boot image is signed with the default key.
$ openssl x509 -pubkey -noout -in build/target/product/security/verity.x509.pem > pubkey.pem
$ verify_boot_signature $OUT/boot.img pubkey.pem; echo $?
Signature is VALID
0
- Signed boot image should be verified with the OEM pubkey.
$ verify_boot_signature boot.img bullhead_pub.pem; echo $?
Signature is VALID
0
- Locally built boot image can be verified with its embedded certificate
but not with the OEM pubkey. This will lead to the YELLOW boot state.
$ verify_boot_signature $OUT/boot.img; echo $?
Signature is VALID
0
$ verify_boot_signature $OUT/boot.img bullhead_pub.pem; echo $?
<...>
1
Bug:
32173582
Test: See above.
Change-Id: I11043eb796ccd128885e7412e65981cbd0183fb2
Yabin Cui [Wed, 19 Oct 2016 18:04:56 +0000 (11:04 -0700)]
simpleperf: add functions to IOEventLoop.
Support Write Event, and add functions to disable/enable Events.
Bug: http://b/
30974760
Test: run simpleperf_unit_test.
Change-Id: I563738196fe5849d8cc3bee120707fd14076faa8
Yabin Cui [Tue, 18 Oct 2016 21:39:33 +0000 (21:39 +0000)]
Merge "simpleperf: copy document from ndk-" am:
b003c9c9eb
am:
36b8156436
Change-Id: If06d3c2f75c5d623c2e284b92be878ed7caa4c66
Yabin Cui [Tue, 18 Oct 2016 21:33:33 +0000 (21:33 +0000)]
Merge "simpleperf: copy document from ndk-master."
am:
b003c9c9eb
Change-Id: Ie9617ecebb92f2d4dcbbb107373faa581ce79f23
Treehugger Robot [Tue, 18 Oct 2016 21:13:06 +0000 (21:13 +0000)]
Merge "simpleperf: copy document from ndk-master."
Yabin Cui [Tue, 18 Oct 2016 19:26:26 +0000 (12:26 -0700)]
simpleperf: copy document from ndk-master.
Test: None, markdown only
Bug: None
Change-Id: I4d0ba07127f84119524df5d214c4731a7c9f06eb
Tao Bao [Mon, 17 Oct 2016 23:06:31 +0000 (16:06 -0700)]
build_verity_metadata: Support --signer_args argument.
Use argparse to parse input parameters for future extension.
Add 'build' and 'size' as two sub-commands.
- 'build_verity_metadata.py -s SIZE' becomes
'build_verity_metadata.py size SIZE'.
- 'build_verity_metadata.py BLOCKS METADATA_IMAGE ...' becomes
'build_verity_metadata.py build BLOCKS METADATA_IMAGE ...'.
The 'build' command now accepts an optional argument '--signer_args' to
specify signer specific arguments.
Bug:
31500665
Test: Building and signing work w/ and w/o --signer_args.
Change-Id: I3cfd2b584efad216b91d5fcd0314f4468ff7450f
Tao Bao [Mon, 10 Oct 2016 22:35:12 +0000 (22:35 +0000)]
Merge changes from topic 'ext4_utils_header' am:
4ab6af6787 am:
83561b8869
am:
c4f589729b
Change-Id: I0ac92bf5bccb4aac7fa07d75edb0df37a73c6a0e
Tao Bao [Mon, 10 Oct 2016 22:30:22 +0000 (22:30 +0000)]
Merge changes from topic 'ext4_utils_header' am:
4ab6af6787
am:
83561b8869
Change-Id: Ibbe821c05d09318d79c27327000313e012d9d3a2
Tao Bao [Mon, 10 Oct 2016 22:14:52 +0000 (22:14 +0000)]
libfec: Update the header path for ext4_utils. am:
7f46e03817 am:
32dc554ecc
am:
2e8448f08b
Change-Id: I2bdc7e32aa3f4a158ef53f923b02ee46c98a1580
Tao Bao [Mon, 10 Oct 2016 22:14:50 +0000 (22:14 +0000)]
ext4_utils: Export headers for libext4_utils* libs. am:
018ef1be61 am:
46dcc11638
am:
c8a81642cb
Change-Id: I4b7e2a8ba9f53ffbc47a93493f3ef2b9cb2247a4
Tao Bao [Mon, 10 Oct 2016 21:46:12 +0000 (21:46 +0000)]
libfec: Update the header path for ext4_utils. am:
7f46e03817
am:
32dc554ecc
Change-Id: I16f6f4c801d5ac1780feb5f38a8e61c7638c6936
Tao Bao [Mon, 10 Oct 2016 21:46:06 +0000 (21:46 +0000)]
ext4_utils: Export headers for libext4_utils* libs. am:
018ef1be61
am:
46dcc11638
Change-Id: Iefd0e6e102672d27ffb39f1b6905c93a0cc6e8d7
Tao Bao [Mon, 10 Oct 2016 21:36:27 +0000 (21:36 +0000)]
Merge changes from topic 'ext4_utils_header'
am:
4ab6af6787
Change-Id: I76c462b9694e54240cf60ef4c05f124efec91ca1
Tao Bao [Mon, 10 Oct 2016 21:14:53 +0000 (21:14 +0000)]
libfec: Update the header path for ext4_utils.
am:
7f46e03817
Change-Id: I47ccece0df9e7755e1a0ca3b6c5192d19cd143d6
Tao Bao [Mon, 10 Oct 2016 21:14:50 +0000 (21:14 +0000)]
ext4_utils: Export headers for libext4_utils* libs.
am:
018ef1be61
Change-Id: I2169527bc16227bfeb9fc1c8a4f8ea2801aded38
Tao Bao [Mon, 10 Oct 2016 20:07:32 +0000 (20:07 +0000)]
Merge changes from topic 'ext4_utils_header'
* changes:
libfec: Update the header path for ext4_utils.
ext4_utils: Export headers for libext4_utils* libs.
Tao Bao [Thu, 6 Oct 2016 06:11:36 +0000 (23:11 -0700)]
libfec: Update the header path for ext4_utils.
Test: mmma system/extras/libfec
Change-Id: I28b71419019c3bb0873b159e178cdfcfb5d89922
Tao Bao [Wed, 5 Oct 2016 19:44:18 +0000 (12:44 -0700)]
ext4_utils: Export headers for libext4_utils* libs.
So we can do "#include <ext4_utils/make_ext4fs.h>" without adding
"LOCAL_C_INCLUDES += system/extras/ext4_utils".
Also clean up the #include lines in system/extras/ext4_utils/.
Test: `m checkbuild` works.
Change-Id: I3c8b07c9b6f5996160e0cb6d9d069579b1609f60
Elliott Hughes [Sun, 9 Oct 2016 00:15:14 +0000 (00:15 +0000)]
Merge "Rely on the platform -std default." am:
329e73bda6 am:
6b24b5786d
am:
6655268162
Change-Id: I706151b0a0d0fede0ec6b681c9a15f6ffe60a5c8
Elliott Hughes [Sun, 9 Oct 2016 00:10:14 +0000 (00:10 +0000)]
Merge "Rely on the platform -std default." am:
329e73bda6
am:
6b24b5786d
Change-Id: Ic3862d558e257d65fb765aeb01fbe2795df22d18
Elliott Hughes [Sun, 9 Oct 2016 00:05:12 +0000 (00:05 +0000)]
Merge "Rely on the platform -std default."
am:
329e73bda6
Change-Id: Ib75b6aeb6a9633e327d4533f25c68fc99323fb6d
Treehugger Robot [Sun, 9 Oct 2016 00:00:53 +0000 (00:00 +0000)]
Merge "Rely on the platform -std default."
Elliott Hughes [Fri, 7 Oct 2016 22:19:02 +0000 (15:19 -0700)]
Rely on the platform -std default.
Bug: http://b/
32019064
Test: builds
Change-Id: I301b223df84ffdea7c93b5c735c859abcc5bb220
Wei Wang [Fri, 7 Oct 2016 03:24:13 +0000 (03:24 +0000)]
Merge "Fix ext4_util logging" am:
c9ff61e5f4 am:
581b45e474
am:
0b6bdf1674
Change-Id: I56ac5f64230dac0b104032fadb9930ecc3c913f4
Wei Wang [Fri, 7 Oct 2016 03:20:43 +0000 (03:20 +0000)]
Merge "Fix ext4_util logging" am:
c9ff61e5f4
am:
581b45e474
Change-Id: I64f9b87d955aceb1cacdd29dfc01c13a6658cf3c
Wei Wang [Fri, 7 Oct 2016 03:17:16 +0000 (03:17 +0000)]
Merge "Fix ext4_util logging"
am:
c9ff61e5f4
Change-Id: Id12b9e614d8bf12ccd5154816b0d3ec284d3ed2a
Treehugger Robot [Fri, 7 Oct 2016 03:08:51 +0000 (03:08 +0000)]
Merge "Fix ext4_util logging"
Wei Wang [Thu, 6 Oct 2016 22:57:59 +0000 (15:57 -0700)]
Fix ext4_util logging
Init moved to base logging and current implementation will messed up the
init process logging
Bug:
31965943
Test: take the log after CL
Change-Id: I8823aa17d9dce082360261537d87ac15389d6ad8
Wei Wang [Thu, 6 Oct 2016 19:43:25 +0000 (19:43 +0000)]
Merge "simpleperf: add perf counter into trace" am:
a697736734 am:
8ec09a14ca
am:
4abb209ba0
Change-Id: I0a75682409ef24a898e77aecb5e9adab1da5405f
Wei Wang [Thu, 6 Oct 2016 19:43:14 +0000 (19:43 +0000)]
simpleperf: add perf counter into trace am:
cf69e4190b am:
6e26adf23f
am:
56e5cac50b
Change-Id: Iecd4179f6304aaffff47e04f6c25c038a9f11040
Wei Wang [Thu, 6 Oct 2016 19:40:24 +0000 (19:40 +0000)]
Merge "simpleperf: add perf counter into trace" am:
a697736734
am:
8ec09a14ca
Change-Id: I4d48c0af6580e48192ee455fc44286b64620a3f6
Wei Wang [Thu, 6 Oct 2016 19:40:14 +0000 (19:40 +0000)]
simpleperf: add perf counter into trace am:
cf69e4190b
am:
6e26adf23f
Change-Id: I6cde025d0fecc80de059818280a9fa6f350089e5
Wei Wang [Thu, 6 Oct 2016 19:37:15 +0000 (19:37 +0000)]
Merge "simpleperf: add perf counter into trace"
am:
a697736734
Change-Id: I317b14d9d3ffc648b6c2ba74f97cd332a4a59240
Wei Wang [Thu, 6 Oct 2016 19:37:14 +0000 (19:37 +0000)]
simpleperf: add perf counter into trace
am:
cf69e4190b
Change-Id: Ie577beb249c440766689deaf418329f42a3fae7e
Treehugger Robot [Thu, 6 Oct 2016 19:32:37 +0000 (19:32 +0000)]
Merge "simpleperf: add perf counter into trace"
Wei Wang [Thu, 29 Sep 2016 23:34:15 +0000 (16:34 -0700)]
simpleperf: add perf counter into trace
Bug: http://b/
31840600
Test: captured systrace with simpleperf stat
Change-Id: I14447d048ea8d059a377c6f0d7cfc10041a98693
Elliott Hughes [Wed, 5 Oct 2016 21:07:50 +0000 (21:07 +0000)]
Merge "Test for _WIN32 in system/extras instead of USE_MINGW." am:
1607d18122 am:
bc6d8081ce
am:
bbbb529acf
Change-Id: Ic1fb45f99c4ee2a313520e538ffe94fc088438b6
Elliott Hughes [Wed, 5 Oct 2016 21:04:50 +0000 (21:04 +0000)]
Merge "Test for _WIN32 in system/extras instead of USE_MINGW." am:
1607d18122
am:
bc6d8081ce
Change-Id: Ic96642cefbb6433ff07ec9ba37b611b24dc90616
Elliott Hughes [Wed, 5 Oct 2016 21:01:51 +0000 (21:01 +0000)]
Merge "Test for _WIN32 in system/extras instead of USE_MINGW."
am:
1607d18122
Change-Id: I44a4dacd7f130e86e86ac0fb1fe260e5f67bbfd2
Treehugger Robot [Wed, 5 Oct 2016 20:56:57 +0000 (20:56 +0000)]
Merge "Test for _WIN32 in system/extras instead of USE_MINGW."