OSDN Git Service

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

7 years agoMerge "Add missing liblog dependency"
Dimitry Ivanov [Wed, 28 Sep 2016 18:56:07 +0000 (18:56 +0000)]
Merge "Add missing liblog dependency"

7 years agoAdd missing liblog dependency
Dimitry Ivanov [Tue, 27 Sep 2016 16:22:50 +0000 (09:22 -0700)]
Add missing liblog dependency

Bug: http://b/31289077
Bug: http://b/27171986
Test: remove liblog from libcutils and recompile
Change-Id: Ibf5b6a978a424107ad1364e35c9bb856d8bde92f

7 years agoMerge "Stop coalescing kernel processes to the same name, other changes." am: 400e7c238a
Than McIntosh [Tue, 27 Sep 2016 02:30:15 +0000 (02:30 +0000)]
Merge "Stop coalescing kernel processes to the same name, other changes." am: 400e7c238a
am: 9da97f38d2

Change-Id: I15582edb6822edada30b75c3a14b521f53b05b07

7 years agoMerge "Stop coalescing kernel processes to the same name, other changes."
Than McIntosh [Tue, 27 Sep 2016 02:27:45 +0000 (02:27 +0000)]
Merge "Stop coalescing kernel processes to the same name, other changes."
am: 400e7c238a

Change-Id: Ie55b0d948f11615d386e5a35e72eeb08f1e34798

7 years agoMerge "Stop coalescing kernel processes to the same name, other changes."
Than McIntosh [Tue, 27 Sep 2016 02:18:56 +0000 (02:18 +0000)]
Merge "Stop coalescing kernel processes to the same name, other changes."

7 years agoStop coalescing kernel processes to the same name, other changes.
Alexey Alexandrov [Sun, 25 Sep 2016 00:05:28 +0000 (17:05 -0700)]
Stop coalescing kernel processes to the same name, other changes.

* Do not coalesce kernel processes to the same name as knowing the
  breakdown of kernel cycles by the name of kernel or user process is
  useful.
* Make the perfprofd tests run well in 64-bit mode.
* Add debugging "-x PATH" flag to perfprofd which can be used to convert
  the given perf data file to the encoded proto format and immediately
  exit.

Test: 32-bit and 64-bit perfprofd_test on the device
Change-Id: Iec35190db995243eed253045605f8807bc0bddee

7 years agoMerge "Add missing include." am: ee34d0cbe3
Dan Albert [Wed, 21 Sep 2016 23:42:07 +0000 (23:42 +0000)]
Merge "Add missing include." am: ee34d0cbe3
am: bf9ccfcdc1

Change-Id: I16429aab6ce4c9de30ddfde46d997a2b16e9d290

7 years agoMerge "Add missing include."
Dan Albert [Wed, 21 Sep 2016 23:22:01 +0000 (23:22 +0000)]
Merge "Add missing include."
am: ee34d0cbe3

Change-Id: I38a65973877df0bb84804e72b4ca15dfd0265d30

7 years agoMerge "Add missing include."
Treehugger Robot [Wed, 21 Sep 2016 22:46:04 +0000 (22:46 +0000)]
Merge "Add missing include."

7 years agoAdd missing include.
Dan Albert [Wed, 21 Sep 2016 21:06:39 +0000 (14:06 -0700)]
Add missing include.

Test: mm
Bug: None
Change-Id: Iffdcdc12aa95b090e26afbbacb22d91e4fdd52ea

7 years agoMerge "avb: move to external/avb." am: 8cb66d9004
David Zeuthen [Fri, 16 Sep 2016 22:40:34 +0000 (22:40 +0000)]
Merge "avb: move to external/avb." am: 8cb66d9004
am: 55b441275c

Change-Id: Id8108b6774258526ec68ae38e0e8ad471e85cbf1

7 years agoMerge "avb: move to external/avb."
David Zeuthen [Fri, 16 Sep 2016 22:38:04 +0000 (22:38 +0000)]
Merge "avb: move to external/avb."
am: 8cb66d9004

Change-Id: I0bbb35ecf92cef29108284eb86657ecdb3b2382c

7 years agoMerge "avb: move to external/avb."
David Zeuthen [Fri, 16 Sep 2016 22:35:50 +0000 (22:35 +0000)]
Merge "avb: move to external/avb."

7 years agoMerge "simpleperf: calculate perf clock based on system clock." am: 0b49810b7c
Yabin Cui [Fri, 16 Sep 2016 21:38:12 +0000 (21:38 +0000)]
Merge "simpleperf: calculate perf clock based on system clock." am: 0b49810b7c
am: 85b29cc7a6

Change-Id: Ib6dc526d476bc8122514102a326a8d469497eec1

7 years agoMerge "simpleperf: calculate perf clock based on system clock."
Yabin Cui [Fri, 16 Sep 2016 21:36:14 +0000 (21:36 +0000)]
Merge "simpleperf: calculate perf clock based on system clock."
am: 0b49810b7c

Change-Id: I4c2b7ab221dae6e47bfde72931ed758a84b2da3a

7 years agoMerge "simpleperf: calculate perf clock based on system clock."
Treehugger Robot [Fri, 16 Sep 2016 21:27:39 +0000 (21:27 +0000)]
Merge "simpleperf: calculate perf clock based on system clock."

7 years agoavb: move to external/avb.
David Zeuthen [Fri, 16 Sep 2016 20:21:13 +0000 (16:21 -0400)]
avb: move to external/avb.

This code is now in external/avb so remove it here.

BUG=31508897
TEST=Build succeeds.

Change-Id: I5d934918885e979a4615745890a05f75732ba027

7 years agosimpleperf: calculate perf clock based on system clock.
Yabin Cui [Thu, 15 Sep 2016 17:43:20 +0000 (10:43 -0700)]
simpleperf: calculate perf clock based on system clock.

The timestamps of perf event records are not generated
by MONOTONIC system clock. However, we can calculate
perf clock based on MONOTONIC system clock.
See http://www.gossamer-threads.com/lists/linux/kernel/1970811

Bug: http://b/30975131
Test: run `simpleperf record -a --log verbose ls` and check the result.
Change-Id: I78ef28b501aa45a4696c05ec76f6d04363082c5d

7 years agoMerge "libpagemap: add static library for pagemap" am: 7c811a34e5
Dimitry Ivanov [Thu, 15 Sep 2016 23:51:27 +0000 (23:51 +0000)]
Merge "libpagemap: add static library for pagemap" am: 7c811a34e5
am: 722d2366c8

Change-Id: I704608075b659787d73df7efda785a107110a567

7 years agoMerge "libpagemap: add static library for pagemap"
Dimitry Ivanov [Thu, 15 Sep 2016 23:48:38 +0000 (23:48 +0000)]
Merge "libpagemap: add static library for pagemap"
am: 7c811a34e5

Change-Id: Ie7f4f463b439c6fabefb1fcc800d9a22947d65f9

7 years agoMerge "libpagemap: add static library for pagemap"
Treehugger Robot [Thu, 15 Sep 2016 23:37:06 +0000 (23:37 +0000)]
Merge "libpagemap: add static library for pagemap"

7 years agolibpagemap: add static library for pagemap
Dimitry Ivanov [Thu, 15 Sep 2016 22:01:59 +0000 (15:01 -0700)]
libpagemap: add static library for pagemap

Bionic unit/cts tests need use static version of libpagemap
to avoid depending on internal android library.

Test: mm && run pagemap_static_test
Bug: http://b/22182538
Change-Id: Ic8b4e74565f77a71540e8cb2c7f9dc67f8d5e10c

7 years agoMerge "avb: Add support for sparse image files." am: 812d0a9a51
David Zeuthen [Tue, 6 Sep 2016 18:07:30 +0000 (18:07 +0000)]
Merge "avb: Add support for sparse image files." am: 812d0a9a51
am: be52375e27

Change-Id: I0f39fe095a1e8f6b7e4293845d0e99577cf57933

7 years agoMerge "avb: Add support for sparse image files."
David Zeuthen [Tue, 6 Sep 2016 18:04:02 +0000 (18:04 +0000)]
Merge "avb: Add support for sparse image files."
am: 812d0a9a51

Change-Id: I0da44501434c8593afce528a59b61b92a8b9fa9d

7 years agoMerge "avb: Add support for sparse image files."
David Zeuthen [Tue, 6 Sep 2016 17:53:48 +0000 (17:53 +0000)]
Merge "avb: Add support for sparse image files."

7 years agoMerge "Use android::base::GetExecutablePath in simpleperf." am: 3eee005507
Elliott Hughes [Sat, 3 Sep 2016 03:16:35 +0000 (03:16 +0000)]
Merge "Use android::base::GetExecutablePath in simpleperf." am: 3eee005507
am: 7633b9ee01

Change-Id: I6901c8268bd4c752400efc6a94e25bd3e9767350

7 years agoMerge "Use android::base::GetExecutablePath in simpleperf."
Elliott Hughes [Sat, 3 Sep 2016 03:14:08 +0000 (03:14 +0000)]
Merge "Use android::base::GetExecutablePath in simpleperf."
am: 3eee005507

Change-Id: I22691e3f07655fc11ea02836099619f6e14f8a7a

7 years agoMerge "Use android::base::GetExecutablePath in simpleperf."
Treehugger Robot [Sat, 3 Sep 2016 03:06:05 +0000 (03:06 +0000)]
Merge "Use android::base::GetExecutablePath in simpleperf."

7 years agoUse android::base::GetExecutablePath in simpleperf.
Elliott Hughes [Fri, 2 Sep 2016 20:26:14 +0000 (13:26 -0700)]
Use android::base::GetExecutablePath in simpleperf.

Bug: http://b/30988271
Change-Id: Ide5f1696834cfa1081e86131e24499bd15131cd6

7 years agoMerge "fec: add --padding" am: d77d48271a
Sami Tolvanen [Fri, 2 Sep 2016 18:21:44 +0000 (18:21 +0000)]
Merge "fec: add --padding" am: d77d48271a
am: fd5615187c

Change-Id: I4d8eb3eab0fb4ee9a3fd3d98d9914a5aeae37099

7 years agoMerge "libfec: allow fec_header to be located anywhere" am: c5d58971b7
Sami Tolvanen [Fri, 2 Sep 2016 18:21:43 +0000 (18:21 +0000)]
Merge "libfec: allow fec_header to be located anywhere" am: c5d58971b7
am: afdacc7e57

Change-Id: I1c6c9311a5775772dde94c15b2d72b1c737d78bb

7 years agoMerge "fec: add --padding"
Sami Tolvanen [Fri, 2 Sep 2016 18:18:34 +0000 (18:18 +0000)]
Merge "fec: add --padding"
am: d77d48271a

Change-Id: I91b412aeda0ca388e1a60e354d84984d143e38d4

7 years agoMerge "libfec: allow fec_header to be located anywhere"
Sami Tolvanen [Fri, 2 Sep 2016 18:18:29 +0000 (18:18 +0000)]
Merge "libfec: allow fec_header to be located anywhere"
am: c5d58971b7

Change-Id: I7baa7ef4e801e0b7569edb231d90e019477906ae

7 years agoMerge "fec: add --padding"
Treehugger Robot [Fri, 2 Sep 2016 18:13:32 +0000 (18:13 +0000)]
Merge "fec: add --padding"

7 years agoMerge "libfec: allow fec_header to be located anywhere"
Treehugger Robot [Fri, 2 Sep 2016 18:13:32 +0000 (18:13 +0000)]
Merge "libfec: allow fec_header to be located anywhere"

7 years agoMerge "simpleperf: handle monitored processes correctly when a cpu is up." am: 25bbfdede1
Yabin Cui [Fri, 2 Sep 2016 17:34:06 +0000 (17:34 +0000)]
Merge "simpleperf: handle monitored processes correctly when a cpu is up." am: 25bbfdede1
am: 1edf3e586d

Change-Id: I2fcbc03bb1170dfba625574a7db214aa1d5aff53

7 years agoMerge "simpleperf: handle monitored processes correctly when a cpu is up."
Yabin Cui [Fri, 2 Sep 2016 17:27:07 +0000 (17:27 +0000)]
Merge "simpleperf: handle monitored processes correctly when a cpu is up."
am: 25bbfdede1

Change-Id: I28e427cd0d3f8a631cfc3f119dc7c42740a2a883

7 years agoMerge "simpleperf: handle monitored processes correctly when a cpu is up."
Yabin Cui [Fri, 2 Sep 2016 17:18:15 +0000 (17:18 +0000)]
Merge "simpleperf: handle monitored processes correctly when a cpu is up."

7 years agoavb: Add support for sparse image files.
David Zeuthen [Mon, 22 Aug 2016 19:20:43 +0000 (15:20 -0400)]
avb: Add support for sparse image files.

By default the build system uses sparse images for system.img so support
this in avbtool. Part of this code is derived from simg_dump.py in
system/core/libsparse.

BUG=31263798
TEST=New unit tests and unit tests pass.

Change-Id: Iace73c994102a51c59e82ce208ee8438155c50e1