OSDN Git Service

android-x86/system-extras.git
7 years agoMerge "simpleperf: support building sample record manually." am: 9ffbb8321e am: 2b770...
Yabin Cui [Thu, 20 Oct 2016 23:42:39 +0000 (23:42 +0000)]
Merge "simpleperf: support building sample record manually." am: 9ffbb8321e am: 2b7704df9b
am: 7781cf9817

Change-Id: I947688a2ce0cbb1d27cea0873e4c1f85ff146460

7 years agoMerge "simpleperf: support building sample record manually." am: 9ffbb8321e
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

7 years agoMerge "simpleperf: support building sample record manually."
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

7 years agoMerge "simpleperf: support building sample record manually."
Yabin Cui [Thu, 20 Oct 2016 23:18:53 +0000 (23:18 +0000)]
Merge "simpleperf: support building sample record manually."

7 years agoMerge "libfec: correct verity table only if it's invalid" am: 3e8eb43762 am: 2e4e1b54bf
Sami Tolvanen [Thu, 20 Oct 2016 18:37:48 +0000 (18:37 +0000)]
Merge "libfec: correct verity table only if it's invalid" am: 3e8eb43762 am: 2e4e1b54bf
am: 4772eca615

Change-Id: I328de8ed295ff8a8408c2a9c4fb8764f00b681e0

7 years agoMerge "libfec: correct verity table only if it's invalid" am: 3e8eb43762
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

7 years agoMerge "libfec: correct verity table only if it's invalid"
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

7 years agoMerge "libfec: correct verity table only if it's invalid"
Treehugger Robot [Thu, 20 Oct 2016 18:16:52 +0000 (18:16 +0000)]
Merge "libfec: correct verity table only if it's invalid"

7 years agosimpleperf: support building sample record manually.
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

7 years agoMerge "simpleperf: add functions to IOEventLoop." am: ed2e8624ef am: 3effb0acd7
Yabin Cui [Thu, 20 Oct 2016 17:39:36 +0000 (17:39 +0000)]
Merge "simpleperf: add functions to IOEventLoop." am: ed2e8624ef am: 3effb0acd7
am: 9c2d31d5b6

Change-Id: I0c2f2dd440823affd7c877fe6c3d7339d50d46d2

7 years agoMerge "Simpleperf: add --max-stack and --percent-limit options for report cmd." am...
Yabin Cui [Thu, 20 Oct 2016 17:39:02 +0000 (17:39 +0000)]
Merge "Simpleperf: add --max-stack and --percent-limit options for report cmd." am: 4b76b29dc1 am: 633fa10b26
am: 31b65101a6

Change-Id: I767dcb6761cc73d071fc5ff5d0e5045f5597faed

7 years agoMerge "simpleperf: add functions to IOEventLoop." am: ed2e8624ef
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

7 years agoMerge "Simpleperf: add --max-stack and --percent-limit options for report cmd." am...
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

7 years agoMerge "simpleperf: add functions to IOEventLoop."
Yabin Cui [Thu, 20 Oct 2016 17:23:31 +0000 (17:23 +0000)]
Merge "simpleperf: add functions to IOEventLoop."
am: ed2e8624ef

Change-Id: I156f0396dd6b7c80a1bcc6e22101149a32df6f0d

7 years agoMerge "Simpleperf: add --max-stack and --percent-limit options for report cmd."
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

7 years agoMerge "simpleperf: add functions to IOEventLoop."
Yabin Cui [Thu, 20 Oct 2016 17:18:51 +0000 (17:18 +0000)]
Merge "simpleperf: add functions to IOEventLoop."

7 years agoMerge "Simpleperf: add --max-stack and --percent-limit options for report cmd."
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."

7 years agolibfec: correct verity table only if it's invalid
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

7 years agoSimpleperf: add --max-stack and --percent-limit options for report cmd.
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

7 years agosimpleperf: add functions to IOEventLoop.
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

7 years agoMerge "simpleperf: copy document from ndk-master." am: b003c9c9eb am: 36b8156436
Yabin Cui [Tue, 18 Oct 2016 21:46:14 +0000 (21:46 +0000)]
Merge "simpleperf: copy document from ndk-" am: b003c9c9eb am: 36b8156436
am: 0d1c245f65

Change-Id: I84986974cd19cabd9bf99d185cfcaab0ea09530a

7 years agoMerge "simpleperf: copy document from ndk-master." am: b003c9c9eb
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

7 years agoMerge "simpleperf: copy document from ndk-master."
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

7 years agoMerge "simpleperf: copy document from ndk-master."
Treehugger Robot [Tue, 18 Oct 2016 21:13:06 +0000 (21:13 +0000)]
Merge "simpleperf: copy document from ndk-master."

7 years agosimpleperf: 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

7 years agoANRdaemon: replace sprintf with snprintf
Wei Wang [Wed, 12 Oct 2016 21:35:51 +0000 (14:35 -0700)]
ANRdaemon: replace sprintf with snprintf

Test: run ANRdaemon
Change-Id: I1b39647c2ea0a54c90ec210ccb9a14430944e21d

7 years agoMerge changes from topic 'ext4_utils_header' am: 4ab6af6787 am: 83561b8869 am: c4f589729b
Tao Bao [Mon, 10 Oct 2016 23:02:48 +0000 (23:02 +0000)]
Merge changes from topic 'ext4_utils_header' am: 4ab6af6787 am: 83561b8869 am: c4f589729b
am: 1fc04457bd

Change-Id: Ia4da8d4a6dbcd9f08ababd2d33313c6fbf07a05a

7 years agolibfec: Update the header path for ext4_utils. am: 7f46e03817 am: 32dc554ecc am:...
Tao Bao [Mon, 10 Oct 2016 23:01:42 +0000 (23:01 +0000)]
libfec: Update the header path for ext4_utils. am: 7f46e03817 am: 32dc554ecc am: 2e8448f08b
am: 0ed01f59c1

Change-Id: I15c39b3ec83516fd79b752ceab408b7b918a3b27

7 years agoext4_utils: Export headers for libext4_utils* libs. am: 018ef1be61 am: 46dcc11638...
Tao Bao [Mon, 10 Oct 2016 23:01:40 +0000 (23:01 +0000)]
ext4_utils: Export headers for libext4_utils* libs. am: 018ef1be61 am: 46dcc11638 am: c8a81642cb
am: 6d2345d23d

Change-Id: I5ae5eafa28d5cdbcd469ac59fcd6f789af1712ff

7 years agoMerge changes from topic 'ext4_utils_header' am: 4ab6af6787 am: 83561b8869
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

7 years agoMerge changes from topic 'ext4_utils_header' am: 4ab6af6787
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

7 years agolibfec: Update the header path for ext4_utils. am: 7f46e03817 am: 32dc554ecc
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

7 years agoext4_utils: Export headers for libext4_utils* libs. am: 018ef1be61 am: 46dcc11638
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

7 years agolibfec: Update the header path for ext4_utils. am: 7f46e03817
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

7 years agoext4_utils: Export headers for libext4_utils* libs. am: 018ef1be61
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

7 years agoMerge changes from topic 'ext4_utils_header'
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

7 years agolibfec: Update the header path for ext4_utils.
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

7 years agoext4_utils: Export headers for libext4_utils* libs.
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

7 years agoFixes a segfault (divide by zero in create_unique_file()).
Mohan Srinivasan [Fri, 7 Oct 2016 22:17:49 +0000 (15:17 -0700)]
Fixes a segfault (divide by zero in create_unique_file()).

Don't pass in a zero size into create_unique_file(), since
this function attempts to create and populate a file the
asked size (it also causes a division by zero error when
the size is zero).

Test: Run puncture_fs several times to cover case where
the random number generator returns value which would have
caused size to be 0 (tested with debug printf to catch
the case where we regenerated the random number).

Change-Id: I397b92e2bc1e9164bb2b2e474a7135f81fc30b23
Signed-off-by: Mohan Srinivasan <srmohan@google.com>
7 years agoMerge changes from topic 'ext4_utils_header'
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.

7 years agolibfec: Update the header path for ext4_utils.
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
(cherry picked from commit 7f46e03817817320149ee94b639eab4635566e12)

7 years agoext4_utils: Export headers for libext4_utils* libs.
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
(cherry picked from commit 018ef1be61e749d0fbe0f05179a4f0f9b858ae57)

7 years agolibfec: Update the header path for ext4_utils.
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

7 years agoext4_utils: Export headers for libext4_utils* libs.
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

7 years agoMerge "Rely on the platform -std default." am: 329e73bda6 am: 6b24b5786d am: 6655268162
Elliott Hughes [Sun, 9 Oct 2016 00:28:56 +0000 (00:28 +0000)]
Merge "Rely on the platform -std default." am: 329e73bda6 am: 6b24b5786d am: 6655268162
am: 1ed82a7eab

Change-Id: I0a6d54d811a63c2e3356f854a7b8f26f12a62519

7 years agoMerge "Rely on the platform -std default." am: 329e73bda6 am: 6b24b5786d
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

7 years agoMerge "Rely on the platform -std default." am: 329e73bda6
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

7 years agoMerge "Rely on the platform -std default."
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

7 years agoMerge "Rely on the platform -std default."
Treehugger Robot [Sun, 9 Oct 2016 00:00:53 +0000 (00:00 +0000)]
Merge "Rely on the platform -std default."

7 years agoRely 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

7 years agoMerge "Fix ext4_util logging" am: c9ff61e5f4 am: 581b45e474 am: 0b6bdf1674
Wei Wang [Fri, 7 Oct 2016 03:39:27 +0000 (03:39 +0000)]
Merge "Fix ext4_util logging" am: c9ff61e5f4 am: 581b45e474 am: 0b6bdf1674
am: 3d5575ef3d

Change-Id: I8b4777fd8cdfcee5429ba2133bcedef74cafb520

7 years agoMerge "Fix ext4_util logging" am: c9ff61e5f4 am: 581b45e474
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

7 years agoMerge "Fix ext4_util logging" am: c9ff61e5f4
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

7 years agoMerge "Fix ext4_util logging"
Wei Wang [Fri, 7 Oct 2016 03:17:16 +0000 (03:17 +0000)]
Merge "Fix ext4_util logging"
am: c9ff61e5f4

Change-Id: Id12b9e614d8bf12ccd5154816b0d3ec284d3ed2a

7 years agoMerge "Fix ext4_util logging"
Treehugger Robot [Fri, 7 Oct 2016 03:08:51 +0000 (03:08 +0000)]
Merge "Fix ext4_util logging"

7 years agoMerge "Fix ext4_util logging"
TreeHugger Robot [Fri, 7 Oct 2016 00:45:31 +0000 (00:45 +0000)]
Merge "Fix ext4_util logging"

7 years agoFix 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

7 years agoFix 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

7 years agoMerge "simpleperf: add perf counter into trace" am: a697736734 am: 8ec09a14ca am...
Wei Wang [Thu, 6 Oct 2016 19:46:56 +0000 (19:46 +0000)]
Merge "simpleperf: add perf counter into trace" am: a697736734 am: 8ec09a14ca am: 4abb209ba0
am: a0b50547b8

Change-Id: I96cc5eccc8a6f936f1d5586bd4f1f94c5a1f5d51

7 years agosimpleperf: add perf counter into trace am: cf69e4190b am: 6e26adf23f am: 56e5cac50b
Wei Wang [Thu, 6 Oct 2016 19:46:45 +0000 (19:46 +0000)]
simpleperf: add perf counter into trace am: cf69e4190b am: 6e26adf23f am: 56e5cac50b
am: c81501e071

Change-Id: Ic2034afbe9217c1da9b5584bd8ff7aa34551fc49

7 years agoMerge "simpleperf: add perf counter into trace" am: a697736734 am: 8ec09a14ca
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

7 years agosimpleperf: add perf counter into trace am: cf69e4190b am: 6e26adf23f
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

7 years agoMerge "simpleperf: add perf counter into trace" am: a697736734
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

7 years agosimpleperf: add perf counter into trace am: cf69e4190b
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

7 years agoMerge "simpleperf: add perf counter into trace"
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

7 years agosimpleperf: add perf counter into trace
Wei Wang [Thu, 6 Oct 2016 19:37:14 +0000 (19:37 +0000)]
simpleperf: add perf counter into trace
am: cf69e4190b

Change-Id: Ie577beb249c440766689deaf418329f42a3fae7e

7 years agoMerge "simpleperf: add perf counter into trace"
Treehugger Robot [Thu, 6 Oct 2016 19:32:37 +0000 (19:32 +0000)]
Merge "simpleperf: add perf counter into trace"

7 years agosimpleperf: 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

7 years agoMerge "simpleperf: add perf counter into trace"
TreeHugger Robot [Thu, 6 Oct 2016 18:32:39 +0000 (18:32 +0000)]
Merge "simpleperf: add perf counter into trace"

7 years agoMerge "Test for _WIN32 in system/extras instead of USE_MINGW." am: 1607d18122 am...
Elliott Hughes [Wed, 5 Oct 2016 21:14:00 +0000 (21:14 +0000)]
Merge "Test for _WIN32 in system/extras instead of USE_MINGW." am: 1607d18122 am: bc6d8081ce am: bbbb529acf
am: b46a78bace

Change-Id: I090a96b8cd44cf86c9519591176c79152de7f760

7 years agoMerge "Test for _WIN32 in system/extras instead of USE_MINGW." am: 1607d18122 am...
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

7 years agoMerge "Test for _WIN32 in system/extras instead of USE_MINGW." am: 1607d18122
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

7 years agoMerge "Test for _WIN32 in system/extras instead of USE_MINGW."
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

7 years agoMerge "Test for _WIN32 in system/extras instead of USE_MINGW."
Treehugger Robot [Wed, 5 Oct 2016 20:56:57 +0000 (20:56 +0000)]
Merge "Test for _WIN32 in system/extras instead of USE_MINGW."

7 years agoTest for _WIN32 in system/extras instead of USE_MINGW.
Elliott Hughes [Wed, 5 Oct 2016 16:44:48 +0000 (09:44 -0700)]
Test for _WIN32 in system/extras instead of USE_MINGW.

Bug: http://b/23392815
Test: builds
Change-Id: Ide007c7ac8414a82548cc99fe384c7de9ba7494b

7 years agoMerge "Simpleperf: don't expose EventSelection." am: 9b20e8607c am: 2a102b89cc am...
Yabin Cui [Wed, 5 Oct 2016 04:08:56 +0000 (04:08 +0000)]
Merge "Simpleperf: don't expose EventSelection." am: 9b20e8607c am: 2a102b89cc am: d03c28169f
am: c990e33ab0

Change-Id: Ia1b3a6bcd3b2054679be0126f7d967fd52fc9ebe

7 years agoMerge "Simpleperf: don't expose EventSelection." am: 9b20e8607c am: 2a102b89cc
Yabin Cui [Wed, 5 Oct 2016 04:05:43 +0000 (04:05 +0000)]
Merge "Simpleperf: don't expose EventSelection." am: 9b20e8607c am: 2a102b89cc
am: d03c28169f

Change-Id: Ifa477e75c442deb52204a84713d8cdd70218d49a

7 years agoMerge "Simpleperf: don't expose EventSelection." am: 9b20e8607c
Yabin Cui [Wed, 5 Oct 2016 04:03:15 +0000 (04:03 +0000)]
Merge "Simpleperf: don't expose EventSelection." am: 9b20e8607c
am: 2a102b89cc

Change-Id: I99df3bdc605d0ebfdb05e9cc0a5bfd51ad5704d6

7 years agoMerge "Simpleperf: don't expose EventSelection."
Yabin Cui [Wed, 5 Oct 2016 04:01:14 +0000 (04:01 +0000)]
Merge "Simpleperf: don't expose EventSelection."
am: 9b20e8607c

Change-Id: I6ad43875bf7b41dc587f965bc9682cc35e3835c1

7 years agoMerge "Simpleperf: don't expose EventSelection."
Treehugger Robot [Wed, 5 Oct 2016 03:55:32 +0000 (03:55 +0000)]
Merge "Simpleperf: don't expose EventSelection."

7 years agoMerge "Include custom partitions in dumpcache tool" am: 3d83a673be am: b85a2a5a47...
Wei Wang [Tue, 4 Oct 2016 22:17:49 +0000 (22:17 +0000)]
Merge "Include custom partitions in dumpcache tool" am: 3d83a673be am: b85a2a5a47 am: 6855fd1f22
am: 0e21126c37

Change-Id: Ie845a7e95dc72b5ca131cdcac7f4bd4924d41caa

7 years agoMerge "Include custom partitions in dumpcache tool" am: 3d83a673be am: b85a2a5a47
Wei Wang [Tue, 4 Oct 2016 22:15:49 +0000 (22:15 +0000)]
Merge "Include custom partitions in dumpcache tool" am: 3d83a673be am: b85a2a5a47
am: 6855fd1f22

Change-Id: I147bfc451cbe73a02a9e3265e86922520ec43448

7 years agoMerge "Include custom partitions in dumpcache tool" am: 3d83a673be
Wei Wang [Tue, 4 Oct 2016 22:13:49 +0000 (22:13 +0000)]
Merge "Include custom partitions in dumpcache tool" am: 3d83a673be
am: b85a2a5a47

Change-Id: I261c4147812ea264a7a19a3f2ce0140835924b74

7 years agoMerge "Include custom partitions in dumpcache tool"
Wei Wang [Tue, 4 Oct 2016 22:11:48 +0000 (22:11 +0000)]
Merge "Include custom partitions in dumpcache tool"
am: 3d83a673be

Change-Id: Ie6869449354f33183bf06e0802a5b70f5df021ad

7 years agoMerge "Include custom partitions in dumpcache tool"
Wei Wang [Tue, 4 Oct 2016 21:52:54 +0000 (21:52 +0000)]
Merge "Include custom partitions in dumpcache tool"

7 years agoMerge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE" am: 0a2b8b5ba2 am: 7f904442d5 am:...
Dan Willemsen [Sat, 1 Oct 2016 16:43:28 +0000 (16:43 +0000)]
Merge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE" am: 0a2b8b5ba2 am: 7f904442d5 am: 7fc1dd5306
am: c20870279d

Change-Id: Ifd14bb20dc6c7d40537d858a2dbf6c8f343dd0d1

7 years agoMerge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE" am: 0a2b8b5ba2 am: 7f904442d5
Dan Willemsen [Sat, 1 Oct 2016 16:39:21 +0000 (16:39 +0000)]
Merge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE" am: 0a2b8b5ba2 am: 7f904442d5
am: 7fc1dd5306

Change-Id: I990bc41c28970621207995d9762e64330e5ecb02

7 years agoMerge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE" am: 0a2b8b5ba2
Dan Willemsen [Sat, 1 Oct 2016 16:33:16 +0000 (16:33 +0000)]
Merge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE" am: 0a2b8b5ba2
am: 7f904442d5

Change-Id: I34bf4359ad588c9432d65e372bf7384c2488b471

7 years agoMerge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE"
Dan Willemsen [Sat, 1 Oct 2016 16:29:15 +0000 (16:29 +0000)]
Merge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE"
am: 0a2b8b5ba2

Change-Id: I1fbe69450d72d4b846bfdfc21dda60e68506a7d2

7 years agoMerge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE"
Treehugger Robot [Sat, 1 Oct 2016 16:23:54 +0000 (16:23 +0000)]
Merge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE"

7 years agosimpleperf: 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

7 years agoRemove LOCAL_CTS_GTEST_LIST_EXECUTABLE
Dan Willemsen [Fri, 30 Sep 2016 05:40:10 +0000 (22:40 -0700)]
Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE

The one user has been removed, this is no longer necessary.

Test: None
Change-Id: I387bca94f5b8b719bd75154d996bf64a487a57be

7 years agoMerge "Revert "ext4_utils: -Werror"" am: 3e3353e88f am: 884bf31b61 am: 2108b3a373
Colin Cross [Fri, 30 Sep 2016 01:23:51 +0000 (01:23 +0000)]
Merge "Revert "ext4_utils: -Werror"" am: 3e3353e88f am: 884bf31b61 am: 2108b3a373
am: 5b55849786

Change-Id: Ib5e5191c8a2f5a2e8397e56203d942933bfc7327

7 years agoMerge "Revert "ext4_utils: -Werror"" am: 3e3353e88f am: 884bf31b61
Colin Cross [Fri, 30 Sep 2016 01:19:12 +0000 (01:19 +0000)]
Merge "Revert "ext4_utils: -Werror"" am: 3e3353e88f am: 884bf31b61
am: 2108b3a373

Change-Id: I0047aac1fc06b93c04e71b15e12d5d3cbdb4d0cb

7 years agoMerge "Revert "ext4_utils: -Werror"" am: 3e3353e88f
Colin Cross [Fri, 30 Sep 2016 01:15:40 +0000 (01:15 +0000)]
Merge "Revert "ext4_utils: -Werror"" am: 3e3353e88f
am: 884bf31b61

Change-Id: I7ca06a6ce1d35d0525c709392db23d0a71404bba

7 years agoMerge "Revert "ext4_utils: -Werror""
Colin Cross [Fri, 30 Sep 2016 01:11:13 +0000 (01:11 +0000)]
Merge "Revert "ext4_utils: -Werror""
am: 3e3353e88f

Change-Id: I845d5b2b55f718d870f7ec49c53d85081c024043

7 years agoMerge "Revert "ext4_utils: -Werror""
Colin Cross [Fri, 30 Sep 2016 01:02:53 +0000 (01:02 +0000)]
Merge "Revert "ext4_utils: -Werror""

7 years agoRevert "ext4_utils: -Werror"
Colin Cross [Fri, 30 Sep 2016 01:01:50 +0000 (01:01 +0000)]
Revert "ext4_utils: -Werror"

This reverts commit f55303f4a4a4319e90e671b50a4dcdd131781f35.

Change-Id: I63b6c158536871534cfee9b3fbe416f121d7b75a

7 years agoMerge changes I8405c4fe,I52e6143d am: a38de2e343 am: 882f870f35 am: a12fecdfca
Mark Salyzyn [Fri, 30 Sep 2016 00:42:28 +0000 (00:42 +0000)]
Merge changes I8405c4fe,I52e6143d am: a38de2e343 am: 882f870f35 am: a12fecdfca
am: 78d0e95371

Change-Id: I33932919e589e75209d4f10f09f4f0d25832b28d

7 years agoperfprofd: build error am: 0d33627520 am: 8a1486d7b8 am: f3ca89c509
Mark Salyzyn [Fri, 30 Sep 2016 00:42:23 +0000 (00:42 +0000)]
perfprofd: build error am: 0d33627520 am: 8a1486d7b8 am: f3ca89c509
am: aa87a2375f

Change-Id: Icbd5ed9ab6c5e3ef19557cf93771ad7aba54daec