OSDN Git Service
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
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
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
Treehugger Robot [Sat, 1 Oct 2016 16:23:54 +0000 (16:23 +0000)]
Merge "Remove 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
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
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
Colin Cross [Fri, 30 Sep 2016 01:11:13 +0000 (01:11 +0000)]
Merge "Revert "ext4_utils: -Werror""
am:
3e3353e88f
Change-Id: I845d5b2b55f718d870f7ec49c53d85081c024043
Colin Cross [Fri, 30 Sep 2016 01:02:53 +0000 (01:02 +0000)]
Merge "Revert "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
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
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
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
Mark Salyzyn [Fri, 30 Sep 2016 00:09:56 +0000 (00:09 +0000)]
Merge changes I8405c4fe,I52e6143d am:
a38de2e343
am:
882f870f35
Change-Id: Ieeb9616248bf62dafba9295b9b6af3f4c8ea8c23
Mark Salyzyn [Fri, 30 Sep 2016 00:09:54 +0000 (00:09 +0000)]
perfprofd: build error am:
0d33627520
am:
8a1486d7b8
Change-Id: I8c5081b12f688add365c86dcc9e6939cfd5ecc8a
Mark Salyzyn [Fri, 30 Sep 2016 00:09:52 +0000 (00:09 +0000)]
ext4_utils: -Werror am:
f55303f4a4
am:
6379b757ca
Change-Id: I3530823ea0b59ee0eae67b040d1557f1d5de1fdd
Mark Salyzyn [Fri, 30 Sep 2016 00:07:54 +0000 (00:07 +0000)]
Merge changes I8405c4fe,I52e6143d
am:
a38de2e343
Change-Id: Ie9d96d5d76ad3941eaf9b12d8430d29b2d1c6530
Mark Salyzyn [Fri, 30 Sep 2016 00:07:53 +0000 (00:07 +0000)]
perfprofd: build error
am:
0d33627520
Change-Id: If415b05f2d1af94df20f890dfd57bfaaf8cacb95
Mark Salyzyn [Fri, 30 Sep 2016 00:07:51 +0000 (00:07 +0000)]
ext4_utils: -Werror
am:
f55303f4a4
Change-Id: I3329682ec21e085de023420ab0512c30ebb7daac
Treehugger Robot [Fri, 30 Sep 2016 00:02:50 +0000 (00:02 +0000)]
Merge changes I8405c4fe,I52e6143d
* changes:
perfprofd: build error
ext4_utils: -Werror
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
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
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
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
Chenbo Feng [Thu, 29 Sep 2016 23:14:10 +0000 (23:14 +0000)]
Merge changes Ic93ac4e9,I68a85138 am:
f63f3fde8e
am:
478f708bde
Change-Id: I59c89d6da68db31886b885b955211ec105def375
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
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
Chenbo Feng [Thu, 29 Sep 2016 23:11:05 +0000 (23:11 +0000)]
Merge changes Ic93ac4e9,I68a85138
am:
f63f3fde8e
Change-Id: I4f7b59d3ba7f0b386a103c12b118ed55d2fac390
Chenbo Feng [Thu, 29 Sep 2016 23:11:04 +0000 (23:11 +0000)]
qtaguid replace asprintf with libbase StringPrintf
am:
31399ff501
Change-Id: I8ea246c615ac8af3f980c797ad2ea52997a8cda5
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
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
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
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
Treehugger Robot [Thu, 29 Sep 2016 22:55:47 +0000 (22:55 +0000)]
Merge "simpleperf: 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)
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
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
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
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
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
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
Dimitry Ivanov [Wed, 28 Sep 2016 19:01:38 +0000 (19:01 +0000)]
Merge "Add missing liblog dependency"
am:
1a35848b34
Change-Id: I4801c57c6385588fd745bea34caccb7398009ccc
Dimitry Ivanov [Wed, 28 Sep 2016 18:56:07 +0000 (18:56 +0000)]
Merge "Add 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
Than McIntosh [Tue, 27 Sep 2016 02:33:20 +0000 (02:33 +0000)]
Merge "Stop coalescing kernel processes to the same name, other changes." am:
400e7c238a am:
9da97f38d2
am:
172c07165d
Change-Id: I1c256f3594419af850a73e378f5a75e7d3fdaae8
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
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
Than McIntosh [Tue, 27 Sep 2016 02:18:56 +0000 (02:18 +0000)]
Merge "Stop 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
Dan Albert [Thu, 22 Sep 2016 09:15:46 +0000 (09:15 +0000)]
Merge "Add missing include." am:
ee34d0cbe3 am:
bf9ccfcdc1
am:
7d9d605492
Change-Id: I5c2f90eb804a50fe52d149619f3f61bc4ba71b89
Dan Albert [Wed, 21 Sep 2016 23:42:07 +0000 (23:42 +0000)]
Merge "Add missing include." am:
ee34d0cbe3
am:
bf9ccfcdc1
Change-Id: I16429aab6ce4c9de30ddfde46d997a2b16e9d290
Dan Albert [Wed, 21 Sep 2016 23:22:01 +0000 (23:22 +0000)]
Merge "Add missing include."
am:
ee34d0cbe3
Change-Id: I38a65973877df0bb84804e72b4ca15dfd0265d30
Treehugger Robot [Wed, 21 Sep 2016 22:46:04 +0000 (22:46 +0000)]
Merge "Add 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
David Zeuthen [Fri, 16 Sep 2016 22:43:04 +0000 (22:43 +0000)]
Merge "avb: move to external/avb." am:
8cb66d9004 am:
55b441275c
am:
e783976bd6
Change-Id: I7b2cea13436c9a25650b51c3c12db4fcc3e7252f
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
David Zeuthen [Fri, 16 Sep 2016 22:38:04 +0000 (22:38 +0000)]
Merge "avb: move to external/avb."
am:
8cb66d9004
Change-Id: I0bbb35ecf92cef29108284eb86657ecdb3b2382c
David Zeuthen [Fri, 16 Sep 2016 22:35:50 +0000 (22:35 +0000)]
Merge "avb: move to external/avb."
Yabin Cui [Fri, 16 Sep 2016 21:40:44 +0000 (21:40 +0000)]
Merge "simpleperf: calculate perf clock based on system clock." am:
0b49810b7c am:
85b29cc7a6
am:
bef18fd744
Change-Id: I96c73ac9505a6dae58d6c9e9c62d450e5fbc1726
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
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
Treehugger Robot [Fri, 16 Sep 2016 21:27:39 +0000 (21:27 +0000)]
Merge "simpleperf: calculate perf clock based on system clock."
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
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
Dimitry Ivanov [Thu, 15 Sep 2016 23:53:57 +0000 (23:53 +0000)]
Merge "libpagemap: add static library for pagemap" am:
7c811a34e5 am:
722d2366c8
am:
e0b3ea7e88
Change-Id: Id42bb24043920d778c43a92fb6976a85e4a63214
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
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
Treehugger Robot [Thu, 15 Sep 2016 23:37:06 +0000 (23:37 +0000)]
Merge "libpagemap: 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
Zhengyin Qian [Thu, 8 Sep 2016 01:23:56 +0000 (01:23 +0000)]
ANRdaemon: fix a bug in handling dump request when trace is running.
am:
b403779c94
Change-Id: Icc5dfd9103191213921b4544f2bfa7e3d187652d
Zhengyin Qian [Wed, 7 Sep 2016 22:57:23 +0000 (15:57 -0700)]
ANRdaemon: fix a bug in handling dump request when trace is running.
Change-Id: I16e2be8b90841eef251c83eda9f71c8e70f519ad
David Zeuthen [Tue, 6 Sep 2016 18:28:54 +0000 (18:28 +0000)]
Merge "avb: Add support for sparse image files." am:
812d0a9a51 am:
be52375e27
am:
5ed19cbdb4
Change-Id: Ic2e4b702719b38b6000c248f9c0afc4dc879ab22
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
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
David Zeuthen [Tue, 6 Sep 2016 17:53:48 +0000 (17:53 +0000)]
Merge "avb: Add support for sparse image files."
Elliott Hughes [Sat, 3 Sep 2016 03:19:05 +0000 (03:19 +0000)]
Merge "Use android::base::GetExecutablePath in simpleperf." am:
3eee005507 am:
7633b9ee01
am:
cb12c4f0d4
Change-Id: I9eca56c93fc315b7db0f6cdc77a1f32707a5bb73
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
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
Treehugger Robot [Sat, 3 Sep 2016 03:06:05 +0000 (03:06 +0000)]
Merge "Use 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
Sami Tolvanen [Fri, 2 Sep 2016 18:24:46 +0000 (18:24 +0000)]
Merge "fec: add --padding" am:
d77d48271a am:
fd5615187c
am:
d82f21fb26
Change-Id: I4e29fec6e8fdf7e6da47ca1cecd2ff6383f0237f
Sami Tolvanen [Fri, 2 Sep 2016 18:24:45 +0000 (18:24 +0000)]
Merge "libfec: allow fec_header to be located anywhere" am:
c5d58971b7 am:
afdacc7e57
am:
31f50ef70a
Change-Id: Iff09d9513bf86a247ff66f24dada05915abb6c23
Sami Tolvanen [Fri, 2 Sep 2016 18:21:44 +0000 (18:21 +0000)]
Merge "fec: add --padding" am:
d77d48271a
am:
fd5615187c
Change-Id: I4d8eb3eab0fb4ee9a3fd3d98d9914a5aeae37099
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
Sami Tolvanen [Fri, 2 Sep 2016 18:18:34 +0000 (18:18 +0000)]
Merge "fec: add --padding"
am:
d77d48271a
Change-Id: I91b412aeda0ca388e1a60e354d84984d143e38d4
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
Treehugger Robot [Fri, 2 Sep 2016 18:13:32 +0000 (18:13 +0000)]
Merge "fec: add --padding"
Treehugger Robot [Fri, 2 Sep 2016 18:13:32 +0000 (18:13 +0000)]
Merge "libfec: allow fec_header to be located anywhere"
Yabin Cui [Fri, 2 Sep 2016 17:48:00 +0000 (17:48 +0000)]
Merge "simpleperf: handle monitored processes correctly when a cpu is up." am:
25bbfdede1 am:
1edf3e586d
am:
81ee16b741
Change-Id: Iebff1281feb6d0ea1f215f02e197a6cc6ae884e8
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
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
Yabin Cui [Fri, 2 Sep 2016 17:18:15 +0000 (17:18 +0000)]
Merge "simpleperf: handle monitored processes correctly when a cpu is up."
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
Sami Tolvanen [Thu, 1 Sep 2016 23:02:36 +0000 (23:02 +0000)]
Merge changes Ic9258141,If4b32546 am:
643af28f1d am:
700840cf42
am:
5fc58f52a2
Change-Id: If28d755f641d5f1005654fa8e59955446933911d
Sami Tolvanen [Thu, 1 Sep 2016 22:59:51 +0000 (22:59 +0000)]
Merge changes Ic9258141,If4b32546 am:
643af28f1d
am:
700840cf42
Change-Id: I9dbcd9e7df0895d442f498737faf6ee5154b9067
Sami Tolvanen [Thu, 1 Sep 2016 22:56:23 +0000 (22:56 +0000)]
Merge changes Ic9258141,If4b32546
am:
643af28f1d
Change-Id: Id8222d4f40996c578d8da03c1e25aaa2c61a2fa9
Sami Tolvanen [Thu, 1 Sep 2016 22:51:12 +0000 (15:51 -0700)]
libfec: allow fec_header to be located anywhere
Don't require fec_header to be immediately after ECC data.
Bug:
28865197
Change-Id: Ie8faeeb07c35e2593553f7678762aae7f14c2ff7
Treehugger Robot [Thu, 1 Sep 2016 22:47:01 +0000 (22:47 +0000)]
Merge changes Ic9258141,If4b32546
* changes:
fec: remove unneeded target executable
fec: remove unused mmap code
Sami Tolvanen [Thu, 1 Sep 2016 21:54:09 +0000 (14:54 -0700)]
fec: add --padding
Add an option to insert padding between ECC data and fec_header to
make it easier to position the header at the end of the partition.
Bug:
28865197
Change-Id: I8c11401df56d15362fe3eb3c2a6a91ea82b02a83
Sami Tolvanen [Thu, 1 Sep 2016 20:43:51 +0000 (13:43 -0700)]
fec: remove unneeded target executable
Change-Id: Ic925814191b8ac952b584a994cf455f871a8ee0c