OSDN Git Service

android-x86/system-extras.git
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 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

7 years agoext4_utils: -Werror am: f55303f4a4 am: 6379b757ca am: ab0fd7c9c0
Mark Salyzyn [Fri, 30 Sep 2016 00:42:18 +0000 (00:42 +0000)]
ext4_utils: -Werror am: f55303f4a4 am: 6379b757ca am: ab0fd7c9c0
am: 660a60dcc3

Change-Id: I62afe38fae8d7ab1ee0c309e402f49616f6463b6

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

Change-Id: I6842fd1d028d8e13ed511e5fbb74912464bfe087

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

Change-Id: Ib26e8ea8016bbd49ab913382d94dd907d17c57c2

7 years agoext4_utils: -Werror am: f55303f4a4 am: 6379b757ca
Mark Salyzyn [Fri, 30 Sep 2016 00:12:21 +0000 (00:12 +0000)]
ext4_utils: -Werror am: f55303f4a4 am: 6379b757ca
am: ab0fd7c9c0

Change-Id: Ibb84cf27abc9cb8455cacbd26443ce7bf9b422ca

7 years agoMerge changes I8405c4fe,I52e6143d am: a38de2e343
Mark Salyzyn [Fri, 30 Sep 2016 00:09:56 +0000 (00:09 +0000)]
Merge changes I8405c4fe,I52e6143d am: a38de2e343
am: 882f870f35

Change-Id: Ieeb9616248bf62dafba9295b9b6af3f4c8ea8c23

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

Change-Id: I8c5081b12f688add365c86dcc9e6939cfd5ecc8a

7 years agoext4_utils: -Werror am: f55303f4a4
Mark Salyzyn [Fri, 30 Sep 2016 00:09:52 +0000 (00:09 +0000)]
ext4_utils: -Werror am: f55303f4a4
am: 6379b757ca

Change-Id: I3530823ea0b59ee0eae67b040d1557f1d5de1fdd

7 years agoMerge changes I8405c4fe,I52e6143d
Mark Salyzyn [Fri, 30 Sep 2016 00:07:54 +0000 (00:07 +0000)]
Merge changes I8405c4fe,I52e6143d
am: a38de2e343

Change-Id: Ie9d96d5d76ad3941eaf9b12d8430d29b2d1c6530

7 years agoperfprofd: build error
Mark Salyzyn [Fri, 30 Sep 2016 00:07:53 +0000 (00:07 +0000)]
perfprofd: build error
am: 0d33627520

Change-Id: If415b05f2d1af94df20f890dfd57bfaaf8cacb95

7 years agoext4_utils: -Werror
Mark Salyzyn [Fri, 30 Sep 2016 00:07:51 +0000 (00:07 +0000)]
ext4_utils: -Werror
am: f55303f4a4

Change-Id: I3329682ec21e085de023420ab0512c30ebb7daac

7 years agoMerge changes I8405c4fe,I52e6143d
Treehugger Robot [Fri, 30 Sep 2016 00:02:50 +0000 (00:02 +0000)]
Merge changes I8405c4fe,I52e6143d

* changes:
  perfprofd: build error
  ext4_utils: -Werror

7 years agoMerge changes Ic93ac4e9,I68a85138 am: f63f3fde8e am: 478f708bde am: 890b9aad98
Chenbo Feng [Thu, 29 Sep 2016 23:20:20 +0000 (23:20 +0000)]
Merge changes Ic93ac4e9,I68a85138 am: f63f3fde8e am: 478f708bde am: 890b9aad98
am: 2583a24a8a

Change-Id: I021ad6757f17397e0ec9a5f20e0029742c68fbc6

7 years agoqtaguid replace asprintf with libbase StringPrintf am: 31399ff501 am: bc6aecfdfe...
Chenbo Feng [Thu, 29 Sep 2016 23:20:18 +0000 (23:20 +0000)]
qtaguid replace asprintf with libbase StringPrintf am: 31399ff501 am: bc6aecfdfe am: f82bbd5e3e
am: 685fe14ad6

Change-Id: I58b8bd982072b885a5315d066e5c9692773288eb

7 years agoqtaguid: test: fix issue with buffer overflow am: 2e363e48f8 am: bdcf0b3e27 am: cd85d...
Chenbo Feng [Thu, 29 Sep 2016 23:20:16 +0000 (23:20 +0000)]
qtaguid: test: fix issue with buffer overflow am: 2e363e48f8 am: bdcf0b3e27 am: cd85d2c81a
am: b662379da7

Change-Id: I0c0353d49e0c9fd6b1ba1238058d78a7e7d3b921

7 years agoMerge "simpleperf: add interval to stat print" am: 3f25c5296d am: 1effe20541 am:...
Wei Wang [Thu, 29 Sep 2016 23:20:07 +0000 (23:20 +0000)]
Merge "simpleperf: add interval to stat print" am: 3f25c5296d am: 1effe20541 am: 94f1f1bfc1
am: 6b55716e47

Change-Id: I389c0da2c2b8947001284fc66610937310028cf4

7 years agoMerge changes Ic93ac4e9,I68a85138 am: f63f3fde8e am: 478f708bde
Chenbo Feng [Thu, 29 Sep 2016 23:15:27 +0000 (23:15 +0000)]
Merge changes Ic93ac4e9,I68a85138 am: f63f3fde8e am: 478f708bde
am: 890b9aad98

Change-Id: I2eb178aa559a464d907921ebe60b10528e74849b

7 years agoqtaguid replace asprintf with libbase StringPrintf am: 31399ff501 am: bc6aecfdfe
Chenbo Feng [Thu, 29 Sep 2016 23:15:25 +0000 (23:15 +0000)]
qtaguid replace asprintf with libbase StringPrintf am: 31399ff501 am: bc6aecfdfe
am: f82bbd5e3e

Change-Id: I69898d31f2c0534e4f9f9da9b45f95556acd3d81

7 years agoqtaguid: test: fix issue with buffer overflow am: 2e363e48f8 am: bdcf0b3e27
Chenbo Feng [Thu, 29 Sep 2016 23:15:22 +0000 (23:15 +0000)]
qtaguid: test: fix issue with buffer overflow am: 2e363e48f8 am: bdcf0b3e27
am: cd85d2c81a

Change-Id: Ifb7e4bdbc2c75f43ae41adc3ff40001959f25303

7 years agoMerge "simpleperf: add interval to stat print" am: 3f25c5296d am: 1effe20541
Wei Wang [Thu, 29 Sep 2016 23:15:12 +0000 (23:15 +0000)]
Merge "simpleperf: add interval to stat print" am: 3f25c5296d am: 1effe20541
am: 94f1f1bfc1

Change-Id: I7ac8d9f9d819826c35859df7c66073eb9a7b3b00

7 years agoMerge changes Ic93ac4e9,I68a85138 am: f63f3fde8e
Chenbo Feng [Thu, 29 Sep 2016 23:14:10 +0000 (23:14 +0000)]
Merge changes Ic93ac4e9,I68a85138 am: f63f3fde8e
am: 478f708bde

Change-Id: I59c89d6da68db31886b885b955211ec105def375

7 years agoqtaguid replace asprintf with libbase StringPrintf am: 31399ff501
Chenbo Feng [Thu, 29 Sep 2016 23:14:08 +0000 (23:14 +0000)]
qtaguid replace asprintf with libbase StringPrintf am: 31399ff501
am: bc6aecfdfe

Change-Id: If494987903a1381a6df7ac46040f65be64476ce6

7 years agoqtaguid: test: fix issue with buffer overflow am: 2e363e48f8
Chenbo Feng [Thu, 29 Sep 2016 23:14:05 +0000 (23:14 +0000)]
qtaguid: test: fix issue with buffer overflow am: 2e363e48f8
am: bdcf0b3e27

Change-Id: I4b197219f7bf802dcfbcb8d64da14993958ba6a7

7 years agoMerge changes Ic93ac4e9,I68a85138
Chenbo Feng [Thu, 29 Sep 2016 23:11:05 +0000 (23:11 +0000)]
Merge changes Ic93ac4e9,I68a85138
am: f63f3fde8e

Change-Id: I4f7b59d3ba7f0b386a103c12b118ed55d2fac390

7 years agoqtaguid replace asprintf with libbase StringPrintf
Chenbo Feng [Thu, 29 Sep 2016 23:11:04 +0000 (23:11 +0000)]
qtaguid replace asprintf with libbase StringPrintf
am: 31399ff501

Change-Id: I8ea246c615ac8af3f980c797ad2ea52997a8cda5

7 years agoqtaguid: test: fix issue with buffer overflow
Chenbo Feng [Thu, 29 Sep 2016 23:11:03 +0000 (23:11 +0000)]
qtaguid: test: fix issue with buffer overflow
am: 2e363e48f8

Change-Id: I257f3c97f43e7c6a86deea1025d7215dd4857b5e

7 years agoInclude custom partitions in dumpcache tool
Wei Wang [Mon, 26 Sep 2016 23:47:49 +0000 (16:47 -0700)]
Include custom partitions in dumpcache tool

Currently dumpcache use whitelist to include only standard partitions
and also print duplicated entries with symbolic link which makes the
total summary inaccurate.
This patch use blacklist "rootfs/devfs/tmpfs/procfs" to support more
partitions and skip symbolic links.

Test: manual - took a dumpcache
Bug: 31756965
Change-Id: I6038de9a2f3be11179cb30b4c4c6d2e7cd43aaa6

7 years agoMerge changes Ic93ac4e9,I68a85138
Treehugger Robot [Thu, 29 Sep 2016 23:06:05 +0000 (23:06 +0000)]
Merge changes Ic93ac4e9,I68a85138

* changes:
  qtaguid replace asprintf with libbase StringPrintf
  qtaguid: test: fix issue with buffer overflow

7 years agoMerge "Include custom partitions in dumpcache tool"
TreeHugger Robot [Thu, 29 Sep 2016 23:05:40 +0000 (23:05 +0000)]
Merge "Include custom partitions in dumpcache tool"

7 years agoMerge "simpleperf: add interval to stat print" am: 3f25c5296d
Wei Wang [Thu, 29 Sep 2016 23:03:46 +0000 (23:03 +0000)]
Merge "simpleperf: add interval to stat print" am: 3f25c5296d
am: 1effe20541

Change-Id: Ib18ea10f2150f2bc94a7616b7a0e64bfdb44219a

7 years agoMerge "simpleperf: add interval to stat print"
Wei Wang [Thu, 29 Sep 2016 23:00:17 +0000 (23:00 +0000)]
Merge "simpleperf: add interval to stat print"
am: 3f25c5296d

Change-Id: Ib09e0f07dfbc7e75b0493de428414b9632a2351b

7 years agoMerge "simpleperf: add interval to stat print"
Treehugger Robot [Thu, 29 Sep 2016 22:55:47 +0000 (22:55 +0000)]
Merge "simpleperf: add interval to stat print"

7 years agoSimpleperf: don't expose EventSelection.
Yabin Cui [Thu, 29 Sep 2016 22:32:45 +0000 (15:32 -0700)]
Simpleperf: don't expose EventSelection.

And some tiny improvements.

Bug: http://b/30974760
Test: run simpleperf_unit_test.
Change-Id: Ie2d46c8ab9ee763d107527c9a54590f845569da4

7 years agosimpleperf: add interval to stat print
Wei Wang [Wed, 28 Sep 2016 21:42:02 +0000 (14:42 -0700)]
simpleperf: add interval to stat print

Add a stat interval printing

Bug: http://b/31806433
Test: simpleperf_unit_test --gtest_filter=stat_cmd.interval_option
Change-Id: Ia2881d990036cc099baccb8a2d8cd3828877a910
(cherry picked from commit e6d8a52400fe710b743ce57b89bd015ab219434b)

7 years agoperfprofd: build error
Mark Salyzyn [Thu, 29 Sep 2016 17:44:36 +0000 (10:44 -0700)]
perfprofd: build error

Must define LOG_TAG before including android/log.h

Test: build success
Bug: 26552300
Bug: 31289077
Change-Id: I8405c4fe21984aa1d339c6e7e452e70a43324c8b

7 years agoext4_utils: -Werror
Mark Salyzyn [Fri, 13 May 2016 21:28:32 +0000 (14:28 -0700)]
ext4_utils: -Werror

Correct a few compiler warnings

Test: build success
Bug: 26552300
Bug: 31289077
Change-Id: I52e6143df465c02b94fe89c80b1712706da1ab7c

7 years agoqtaguid replace asprintf with libbase StringPrintf
Chenbo Feng [Thu, 29 Sep 2016 00:03:31 +0000 (17:03 -0700)]
qtaguid replace asprintf with libbase StringPrintf

use libbase function android::base::StringPrintf for string
manipulation. Avoid free the char array at the end. Changed the program
logic of building the match template to make it more concise.

Test: manually tested on angler device. build and sync this module into
device and run adb shell ./data/nativetest64/socketTag/socketTag

Change-Id: Ic93ac4e91e87337acb2e12efadeb57833c36c95e

7 years agoqtaguid: test: fix issue with buffer overflow
Chenbo Feng [Wed, 28 Sep 2016 17:01:42 +0000 (10:01 -0700)]
qtaguid: test: fix issue with buffer overflow

Fixed the bug that test program cannot read socket addr directly from
ctrl file, changed the implementation of read ctrl file to prevent
possible fails when the ctrl file size is greater then the read buffer
size.

Test: manually tested on angler device. build and sync this module into
device and run adb shell ./data/nativetest64/socketTag/socketTag

Change-Id: I68a8513814a97d9417e13ad320a079510591d3a2

7 years agoMerge "simpleperf: add interval to stat print"
TreeHugger Robot [Thu, 29 Sep 2016 04:48:08 +0000 (04:48 +0000)]
Merge "simpleperf: add interval to stat print"

7 years agosimpleperf: add interval to stat print
Wei Wang [Wed, 28 Sep 2016 21:42:02 +0000 (14:42 -0700)]
simpleperf: add interval to stat print

Add a stat interval printing

Bug: http://b/31806433
Test: simpleperf_unit_test --gtest_filter=stat_cmd.interval_option
Change-Id: Ia2881d990036cc099baccb8a2d8cd3828877a910

7 years agoMerge "Add missing liblog dependency" am: 1a35848b34 am: 598ae6f8cb am: b17544df7f
Dimitry Ivanov [Wed, 28 Sep 2016 19:10:53 +0000 (19:10 +0000)]
Merge "Add missing liblog dependency" am: 1a35848b34 am: 598ae6f8cb am: b17544df7f
am: ce2a99c7e6

Change-Id: I707c46e7c3de643c4de548bf5f0a85966192cd50

7 years agoMerge "Add missing liblog dependency" am: 1a35848b34 am: 598ae6f8cb
Dimitry Ivanov [Wed, 28 Sep 2016 19:07:40 +0000 (19:07 +0000)]
Merge "Add missing liblog dependency" am: 1a35848b34 am: 598ae6f8cb
am: b17544df7f

Change-Id: I2405d6f4ac7dd3936e22f989c8a245391f1859d4

7 years agoMerge "Add missing liblog dependency" am: 1a35848b34
Dimitry Ivanov [Wed, 28 Sep 2016 19:04:40 +0000 (19:04 +0000)]
Merge "Add missing liblog dependency" am: 1a35848b34
am: 598ae6f8cb

Change-Id: I5e820972ed8fbf76b71af0a32d543b1579094ad8

7 years agoMerge "Add missing liblog dependency"
Dimitry Ivanov [Wed, 28 Sep 2016 19:01:38 +0000 (19:01 +0000)]
Merge "Add missing liblog dependency"
am: 1a35848b34

Change-Id: I4801c57c6385588fd745bea34caccb7398009ccc