OSDN Git Service

android-x86/system-extras.git
7 years agoMerge "make_ext4fs: add option to specify the number of inodes" am: 33d9ecbf96 am...
Pat Tjin [Wed, 7 Dec 2016 07:20:18 +0000 (07:20 +0000)]
Merge "make_ext4fs: add option to specify the number of inodes" am: 33d9ecbf96 am: 9db54ab7b3
am: 3b9050c80b

Change-Id: Ie956b07d01af76f9d020c834078615963ed32404

7 years agoMerge "make_ext4fs: add option to specify the number of inodes" am: 33d9ecbf96
Pat Tjin [Wed, 7 Dec 2016 07:15:47 +0000 (07:15 +0000)]
Merge "make_ext4fs: add option to specify the number of inodes" am: 33d9ecbf96
am: 9db54ab7b3

Change-Id: Iceb76b0636157932347bb52de827f398e21f2766

7 years agoMerge "make_ext4fs: add option to specify the number of inodes"
Pat Tjin [Wed, 7 Dec 2016 07:12:14 +0000 (07:12 +0000)]
Merge "make_ext4fs: add option to specify the number of inodes"
am: 33d9ecbf96

Change-Id: I88c802988fc17afcc7274be12940295e0987e341

7 years agoMerge "make_ext4fs: add option to specify the number of inodes"
Pat Tjin [Wed, 7 Dec 2016 07:07:25 +0000 (07:07 +0000)]
Merge "make_ext4fs: add option to specify the number of inodes"

7 years agomake_ext4fs: add option to specify the number of inodes
Patrick Tjin [Thu, 20 Oct 2016 17:55:11 +0000 (10:55 -0700)]
make_ext4fs: add option to specify the number of inodes

Add option to specify the number of inodes to create when
making the filesystem.  Read-only partitions don't have
a need for extra inodes, a lot of space is wasted by these
inodes.

Bug: 32246383
Test: make vendor partition with new options
Change-Id: I7063972ec4f4e617d28d2e029ad6a9f8e94add73
(cherry picked from commit 15c434682ac78262d2dad9730805eab52b748cdf)

7 years agoMerge "simpleperf: add binary_cache_builder script." am: a5a101294e am: 7b4295f4ab
Yabin Cui [Sat, 3 Dec 2016 04:43:33 +0000 (04:43 +0000)]
Merge "simpleperf: add binary_cache_builder script." am: a5a101294e am: 7b4295f4ab
am: 5564824d90

Change-Id: Ie5834ce95e03799c641405b93a7d7e8f4940b9d9

7 years agoMerge "simpleperf: add binary_cache_builder script." am: a5a101294e
Yabin Cui [Sat, 3 Dec 2016 04:37:47 +0000 (04:37 +0000)]
Merge "simpleperf: add binary_cache_builder script." am: a5a101294e
am: 7b4295f4ab

Change-Id: Ife23eed139391475b0b00ac86c77c993a5c471d3

7 years agoMerge "simpleperf: add binary_cache_builder script."
Yabin Cui [Sat, 3 Dec 2016 04:23:48 +0000 (04:23 +0000)]
Merge "simpleperf: add binary_cache_builder script."
am: a5a101294e

Change-Id: I0c2a0c8037cd95e25dab555e9c348ab7270cfaf7

7 years agoManually merge commit 'bf03f2e' into stage-aosp-master am: a083ba6a48
Adrien Schildknecht [Sat, 3 Dec 2016 04:15:07 +0000 (04:15 +0000)]
Manually merge commit 'bf03f2e' into stage-aosp-master am: a083ba6a48
am: 298394ac68

Change-Id: I21a5898232427ee759f33f53bd1c5c96f4cc5439

7 years agoManually merge commit 'bf03f2e' into stage-aosp-master
Adrien Schildknecht [Sat, 3 Dec 2016 04:13:08 +0000 (04:13 +0000)]
Manually merge commit 'bf03f2e' into stage-aosp-master
am: a083ba6a48

Change-Id: I62ac977e4352061f3d3b7aecbf7dcfbc6026d32a

7 years agoManually merge commit 'bf03f2e' into stage-aosp-master
The Android Automerger [Sat, 3 Dec 2016 04:08:00 +0000 (04:08 +0000)]
Manually merge commit 'bf03f2e' into stage-aosp-master

* commit 'bf03f2e':
  ext4_utils: move ext2simg to upstream e2fsprogs
  ext4_utils: use mke2fs instead of make_ext4

BUG:33304034

7 years agoMerge "simpleperf: add binary_cache_builder script."
Yabin Cui [Fri, 2 Dec 2016 23:38:49 +0000 (23:38 +0000)]
Merge "simpleperf: add binary_cache_builder script."

7 years agoMerge changes from topic 'e2fsprogs'
Treehugger Robot [Fri, 2 Dec 2016 22:48:21 +0000 (22:48 +0000)]
Merge changes from topic 'e2fsprogs'

* changes:
  ext4_utils: move ext2simg to upstream e2fsprogs
  ext4_utils: use mke2fs instead of make_ext4

7 years agosimpleperf: add binary_cache_builder script.
Yabin Cui [Wed, 30 Nov 2016 19:46:20 +0000 (11:46 -0800)]
simpleperf: add binary_cache_builder script.

To report on host, we need to pull binaries from device to host.
binary_cache_builder.py is used to pull needed binaries automatically.

Other changes:
Move common functions to utils.py.
Move libsimpleperf_report.so to proper directory, so we can add other
host shared libraries and target binaries in the future.

Bug: http://b/32834638
Test: run binary_cache_builder.py for N, O devices, both root and non-root.

Change-Id: Ifa8931842087ed43d1e530e40ca0254cbf9ea3a9

7 years agoext4_utils: move ext2simg to upstream e2fsprogs
Adrien Schildknecht [Thu, 1 Dec 2016 23:10:09 +0000 (15:10 -0800)]
ext4_utils: move ext2simg to upstream e2fsprogs

This binary is now part of e2fsprogs.

Test: m ext2simg
Change-Id: I6c30cc7d6c79770541c13c84449e35bbca8b5541

7 years agoext4_utils: use mke2fs instead of make_ext4
Adrien Schildknecht [Wed, 16 Nov 2016 06:33:29 +0000 (22:33 -0800)]
ext4_utils: use mke2fs instead of make_ext4

Test: m -j32 && fastboot flashall (aosp_angler-userdebug)

Change-Id: Ic4f598fdf19c8d6fb44740999663ed4f166b0a5b

7 years agoMerge "simpleperf: improve script interface." am: 090785e4dd am: 72fc75c1f7
Yabin Cui [Wed, 30 Nov 2016 20:00:34 +0000 (20:00 +0000)]
Merge "simpleperf: improve script interface." am: 090785e4dd am: 72fc75c1f7
am: bb4366201f

Change-Id: Ie4e2840c333565b2df03d2ee508ecf1755aa3126

7 years agoMerge "Rewrite bootctl utility to use new HAL interface" am: 1bc97843cb am: fe9d980924
Connor O'Brien [Wed, 30 Nov 2016 20:00:19 +0000 (20:00 +0000)]
Merge "Rewrite bootctl utility to use new HAL interface" am: 1bc97843cb am: fe9d980924
am: 72332cb51b

Change-Id: I5943d75aa91755f9f1d0e1c28ea308f8aaeab4c5

7 years agoMerge "simpleperf: improve script interface." am: 090785e4dd
Yabin Cui [Wed, 30 Nov 2016 19:55:30 +0000 (19:55 +0000)]
Merge "simpleperf: improve script interface." am: 090785e4dd
am: 72fc75c1f7

Change-Id: Ia7c9cc81aa76c4b4f465cf5a6b33884e2c5493fa

7 years agoMerge "Rewrite bootctl utility to use new HAL interface" am: 1bc97843cb
Connor O'Brien [Wed, 30 Nov 2016 19:55:19 +0000 (19:55 +0000)]
Merge "Rewrite bootctl utility to use new HAL interface" am: 1bc97843cb
am: fe9d980924

Change-Id: Icb27cd3a4e99394eab7754eda9b22d23988b3a0f

7 years agoMerge "simpleperf: improve script interface."
Yabin Cui [Wed, 30 Nov 2016 19:49:51 +0000 (19:49 +0000)]
Merge "simpleperf: improve script interface."
am: 090785e4dd

Change-Id: I6536a2764eed1b614628028fccb6a79477208268

7 years agoMerge "Rewrite bootctl utility to use new HAL interface"
Connor O'Brien [Wed, 30 Nov 2016 19:49:37 +0000 (19:49 +0000)]
Merge "Rewrite bootctl utility to use new HAL interface"
am: 1bc97843cb

Change-Id: I99deaf99e0f747ac75f53a03b1e85414228ed715

7 years agoMerge "simpleperf: improve script interface."
Yabin Cui [Wed, 30 Nov 2016 19:39:53 +0000 (19:39 +0000)]
Merge "simpleperf: improve script interface."

7 years agoMerge "Rewrite bootctl utility to use new HAL interface"
Connor O'Brien [Wed, 30 Nov 2016 19:33:34 +0000 (19:33 +0000)]
Merge "Rewrite bootctl utility to use new HAL interface"

7 years agoMerge "simpleperf: fix tests for dwarf callgraph unwinding." am: 35f8849075 am: ed3ee...
Yabin Cui [Wed, 30 Nov 2016 18:05:06 +0000 (18:05 +0000)]
Merge "simpleperf: fix tests for dwarf callgraph unwinding." am: 35f8849075 am: ed3ee52f81
am: fe39f81b95

Change-Id: I9cba435d4541a7293649786f46edf8a5ae094b8a

7 years agoMerge "simpleperf: fix tests for dwarf callgraph unwinding." am: 35f8849075
Yabin Cui [Wed, 30 Nov 2016 18:00:29 +0000 (18:00 +0000)]
Merge "simpleperf: fix tests for dwarf callgraph unwinding." am: 35f8849075
am: ed3ee52f81

Change-Id: I3ed2e28943962ea330ccd4b46c7a432272f16012

7 years agoMerge "simpleperf: fix tests for dwarf callgraph unwinding."
Yabin Cui [Wed, 30 Nov 2016 17:54:55 +0000 (17:54 +0000)]
Merge "simpleperf: fix tests for dwarf callgraph unwinding."
am: 35f8849075

Change-Id: I4329e4c23a5c20e3b13749fcf13ba5bd82ae645e

7 years agoMerge "simpleperf: fix tests for dwarf callgraph unwinding."
Yabin Cui [Wed, 30 Nov 2016 17:41:27 +0000 (17:41 +0000)]
Merge "simpleperf: fix tests for dwarf callgraph unwinding."

7 years agosimpleperf: improve script interface.
Yabin Cui [Tue, 29 Nov 2016 20:54:50 +0000 (12:54 -0800)]
simpleperf: improve script interface.

1. In ReportLib, return structure instead of pointer to structure.
So users can use 'sample' instead of 'sample[0]', as in report_sample.py.

2. For python3, convert char pointer to str type. Because str is more
convenient to use.

Bug: http://b/32834638
Test: run simpleperf_report_lib.py and report_sample.py.
Change-Id: Iee8c3570e82104c5dd02f3f657ac143d1fdc2233

7 years agoRewrite bootctl utility to use new HAL interface
Connor O'Brien [Fri, 14 Oct 2016 22:03:12 +0000 (15:03 -0700)]
Rewrite bootctl utility to use new HAL interface

Test: Ran and compared output to old version
Change-Id: I8889794a5c7953b066a1a7fecd0154c912f4d60d
Signed-off-by: Connor O'Brien <connoro@google.com>
7 years agosimpleperf: fix tests for dwarf callgraph unwinding.
Yabin Cui [Tue, 29 Nov 2016 23:21:13 +0000 (15:21 -0800)]
simpleperf: fix tests for dwarf callgraph unwinding.

32-bit simpleperf can't unwind a 64-bit `sleep` process in aarch64
environment. It makes following error in tests:
simpleperf is built in arch arm, and can't do stack unwinding for arch arm64

So make the workload be able to start a process
running callback function. By profiling that process, we can
guarantee that 32-bit simpleperf is profiling a 32-bit process.

Also fix a flaky test IOEventLoop.signal.
Build 32-bit simpleperf_unit_test on 64-bit devices.

Bug: http://b/33167911
Test: run simpleperf_unit_test.
Change-Id: I82741dc5d90c73c1890f834d8e2a9188421a3828

7 years agoMerge "simpleperf: add stuff in report_lib_interface." am: c11a58e701 am: 016ac14879
Yabin Cui [Tue, 29 Nov 2016 20:02:23 +0000 (20:02 +0000)]
Merge "simpleperf: add stuff in report_lib_interface." am: c11a58e701 am: 016ac14879
am: 969472af65

Change-Id: Ia5b9fa61d5e68aec16b6c69540949da7415f450b

7 years agoMerge "simpleperf: add stuff in report_lib_interface." am: c11a58e701
Yabin Cui [Tue, 29 Nov 2016 19:57:23 +0000 (19:57 +0000)]
Merge "simpleperf: add stuff in report_lib_interface." am: c11a58e701
am: 016ac14879

Change-Id: Iabbcd190c4b94518fa15b5abd1a932063104aece

7 years agoMerge "simpleperf: add stuff in report_lib_interface."
Yabin Cui [Tue, 29 Nov 2016 19:51:53 +0000 (19:51 +0000)]
Merge "simpleperf: add stuff in report_lib_interface."
am: c11a58e701

Change-Id: I6fcdd9b4476d927298f419cee37aaf46c4c0ed2e

7 years agoMerge "simpleperf: add stuff in report_lib_interface."
Yabin Cui [Tue, 29 Nov 2016 19:46:07 +0000 (19:46 +0000)]
Merge "simpleperf: add stuff in report_lib_interface."

7 years agoDO NOT MERGE verity_verifier: Support verifying images with FEC. am: 989f6a13a7 am...
Tao Bao [Tue, 29 Nov 2016 18:24:05 +0000 (18:24 +0000)]
DO NOT MERGE verity_verifier: Support verifying images with FEC. am: 989f6a13a7 am: 533ed53bc0 am: 3734580187 am: 69dd400b72  -s ours
am: 1bec234d84

Change-Id: I21bc233a2c57c6beb856cb2c55dd7532823eafd3

7 years agoDO NOT MERGE verity_verifier: Support verifying images with FEC. am: 989f6a13a7 am...
Tao Bao [Tue, 29 Nov 2016 18:23:44 +0000 (18:23 +0000)]
DO NOT MERGE verity_verifier: Support verifying images with FEC. am: 989f6a13a7 am: 533ed53bc0 am: 3734580187 am: 69dd400b72
am: 378116f05a  -s ours

Change-Id: I4732bd36a0d48ed56cac2b84721d6df67ab1f829

7 years agoDO NOT MERGE verity_verifier: Support verifying images with FEC. am: 989f6a13a7 am...
Tao Bao [Tue, 29 Nov 2016 18:19:04 +0000 (18:19 +0000)]
DO NOT MERGE verity_verifier: Support verifying images with FEC. am: 989f6a13a7 am: 533ed53bc0 am: 3734580187
am: 69dd400b72  -s ours

Change-Id: I4bb866122631ea580cd1811dc4b7e3f5138a2140

7 years agoDO NOT MERGE verity_verifier: Support verifying images with FEC. am: 989f6a13a7 am...
Tao Bao [Tue, 29 Nov 2016 18:14:11 +0000 (18:14 +0000)]
DO NOT MERGE verity_verifier: Support verifying images with FEC. am: 989f6a13a7 am: 533ed53bc0 am: 3734580187
am: 69dd400b72

Change-Id: I9ac01c8b23f58972b1867822c197c36909d771d2

7 years agoDO NOT MERGE verity_verifier: Support verifying images with FEC. am: 989f6a13a7 am...
Tao Bao [Tue, 29 Nov 2016 18:09:11 +0000 (18:09 +0000)]
DO NOT MERGE verity_verifier: Support verifying images with FEC. am: 989f6a13a7 am: 533ed53bc0
am: 3734580187

Change-Id: Id3fd5d9611e86735f5cb54f7888048ff7c108f3b

7 years agoDO NOT MERGE verity_verifier: Support verifying images with FEC. am: 989f6a13a7
Tao Bao [Tue, 29 Nov 2016 18:04:10 +0000 (18:04 +0000)]
DO NOT MERGE verity_verifier: Support verifying images with FEC. am: 989f6a13a7
am: 533ed53bc0

Change-Id: I1eca68a42d8c935f95e6dbeadd8e52ca5df48d01

7 years agoMerge changes I2198f8b5,I245c859e am: c3fbd8b936 am: af3938ae34
Mark Salyzyn [Tue, 29 Nov 2016 17:59:17 +0000 (17:59 +0000)]
Merge changes I2198f8b5,I245c859e am: c3fbd8b936 am: af3938ae34
am: 3d4318fdf6

Change-Id: I710739bcac64579e44fab162fa5dd9afacd8e3d5

7 years agotime test reclassification as gTest am: 11a438be18 am: 0ceab28690
Mark Salyzyn [Tue, 29 Nov 2016 17:59:14 +0000 (17:59 +0000)]
time test reclassification as gTest am: 11a438be18 am: 0ceab28690
am: 40ae93af53

Change-Id: I7460465465b9144577771d86fcd8b40db6cc45ef

7 years agosystem/extras: Replace cutils/log.h with android/log.h or log/log.h am: 3d66aa307e...
Mark Salyzyn [Tue, 29 Nov 2016 17:59:12 +0000 (17:59 +0000)]
system/extras: Replace cutils/log.h with android/log.h or log/log.h am: 3d66aa307e am: 55925a0a50
am: 1ce37777ee

Change-Id: I3a1c830cf024485d1c21fb5d76861614a4e18899

7 years agoDO NOT MERGE verity_verifier: Support verifying images with FEC.
Tao Bao [Tue, 29 Nov 2016 17:59:10 +0000 (17:59 +0000)]
DO NOT MERGE verity_verifier: Support verifying images with FEC.
am: 989f6a13a7

Change-Id: I7e9bebaafac56456c618befee18f971114e24b85

7 years agoMerge changes I2198f8b5,I245c859e am: c3fbd8b936
Mark Salyzyn [Tue, 29 Nov 2016 17:54:46 +0000 (17:54 +0000)]
Merge changes I2198f8b5,I245c859e am: c3fbd8b936
am: af3938ae34

Change-Id: I9092e5733eb6e861ed7631e77ea6968260159de8

7 years agotime test reclassification as gTest am: 11a438be18
Mark Salyzyn [Tue, 29 Nov 2016 17:54:44 +0000 (17:54 +0000)]
time test reclassification as gTest am: 11a438be18
am: 0ceab28690

Change-Id: I8ad8fef52e2949319b3bab0c5cf9e7275560e9d9

7 years agosystem/extras: Replace cutils/log.h with android/log.h or log/log.h am: 3d66aa307e
Mark Salyzyn [Tue, 29 Nov 2016 17:54:41 +0000 (17:54 +0000)]
system/extras: Replace cutils/log.h with android/log.h or log/log.h am: 3d66aa307e
am: 55925a0a50

Change-Id: I763b2d935997e0c125d60f474afe699260c7014c

7 years agoMerge changes I2198f8b5,I245c859e
Mark Salyzyn [Tue, 29 Nov 2016 17:50:14 +0000 (17:50 +0000)]
Merge changes I2198f8b5,I245c859e
am: c3fbd8b936

Change-Id: I8a765ad6d12ea8450fba6f229e564b0a40007c15

7 years agotime test reclassification as gTest
Mark Salyzyn [Tue, 29 Nov 2016 17:50:13 +0000 (17:50 +0000)]
time test reclassification as gTest
am: 11a438be18

Change-Id: I06539c7e894be9a1739779f97fb31ec6f1e672b1

7 years agosystem/extras: Replace cutils/log.h with android/log.h or log/log.h
Mark Salyzyn [Tue, 29 Nov 2016 17:50:12 +0000 (17:50 +0000)]
system/extras: Replace cutils/log.h with android/log.h or log/log.h
am: 3d66aa307e

Change-Id: Ifa46c3083140959b0cd1f27a96de7826a3413205

7 years agosimpleperf: add stuff in report_lib_interface.
Yabin Cui [Tue, 29 Nov 2016 01:28:08 +0000 (17:28 -0800)]
simpleperf: add stuff in report_lib_interface.

It's a preparation to annotate binaries, containing following
changes:
1. Export build_id for binaries.
2. Export function virtual addresses.
3. Add unit tests in simpleperf_report_lib.py.

Bug: http://b/32834638
Test: simpleperf_unit_test.
Test: run `python simpleperf_report_lib.py`.
Change-Id: Ieed40935ff9ede44bf823ba9c88ad87806ffac0a

7 years agoMerge changes I2198f8b5,I245c859e
Treehugger Robot [Tue, 29 Nov 2016 17:42:28 +0000 (17:42 +0000)]
Merge changes I2198f8b5,I245c859e

* changes:
  time test reclassification as gTest
  system/extras: Replace cutils/log.h with android/log.h or log/log.h

7 years agoDO NOT MERGE: libfec: allow fec_header to be located anywhere am: 549f048fcb
Sami Tolvanen [Tue, 29 Nov 2016 00:10:58 +0000 (00:10 +0000)]
DO NOT MERGE: libfec: allow fec_header to be located anywhere am: 549f048fcb
am: 3050f05110

Change-Id: I953944520b1e611b77e9484251777b560a4b775d

7 years agoDO NOT MERGE: fec: add --padding am: 61fce29c45
Sami Tolvanen [Tue, 29 Nov 2016 00:10:55 +0000 (00:10 +0000)]
DO NOT MERGE: fec: add --padding am: 61fce29c45
am: 867093305e

Change-Id: Ia7d07f7a9c6d62a863b04dcc73914a1398def7b5

7 years agoDO NOT MERGE: fec: remove unneeded target executable am: 955d3afe95 -s ours
Sami Tolvanen [Tue, 29 Nov 2016 00:10:52 +0000 (00:10 +0000)]
DO NOT MERGE: fec: remove unneeded target executable am: 955d3afe95  -s ours
am: 4ab0c5b6f7

Change-Id: Ibd1d3e1ac350dd90babfc0a7c1273b6428f20ebe

7 years agoDO NOT MERGE: fec: remove unused mmap code am: cace33a52a -s ours
Sami Tolvanen [Tue, 29 Nov 2016 00:10:49 +0000 (00:10 +0000)]
DO NOT MERGE: fec: remove unused mmap code am: cace33a52a  -s ours
am: ca87aaab7d

Change-Id: Ic795c5dfd0cf974e18a19c94b3b1e6d49f6a6bb2

7 years agoDO NOT MERGE: libfec: allow fec_header to be located anywhere
Sami Tolvanen [Tue, 29 Nov 2016 00:05:54 +0000 (00:05 +0000)]
DO NOT MERGE: libfec: allow fec_header to be located anywhere
am: 549f048fcb

Change-Id: I1c0403a1449d5c6208f8b7330d7d12da7bac7df2

7 years agoDO NOT MERGE: fec: add --padding
Sami Tolvanen [Tue, 29 Nov 2016 00:05:52 +0000 (00:05 +0000)]
DO NOT MERGE: fec: add --padding
am: 61fce29c45

Change-Id: I7c72ae76f73d5c8c48220f6f606722e3b1cd8287

7 years agoDO NOT MERGE: fec: remove unneeded target executable
Sami Tolvanen [Tue, 29 Nov 2016 00:05:48 +0000 (00:05 +0000)]
DO NOT MERGE: fec: remove unneeded target executable
am: 955d3afe95  -s ours

Change-Id: I10e0bc8cd075eb24a98e21916202c529f513943d

7 years agoDO NOT MERGE: fec: remove unused mmap code
Sami Tolvanen [Tue, 29 Nov 2016 00:05:44 +0000 (00:05 +0000)]
DO NOT MERGE: fec: remove unused mmap code
am: cace33a52a  -s ours

Change-Id: I2a0e781693aa7849ddae32fab13b143ca198a242

7 years agobuild_verity_metadata: Support --signer_args argument. am: 1522691d1d am: c2e9c0f0fc...
Tao Bao [Mon, 28 Nov 2016 22:24:37 +0000 (22:24 +0000)]
build_verity_metadata: Support --signer_args argument. am: 1522691d1d am: c2e9c0f0fc am: c681cb32b3 am: b91b1cd229  -s ours
am: c757ed045b

Change-Id: I28c607d40913268cd67d6cf65cd333d6e6194f53

7 years agobuild_verity_metadata: Support --signer_args argument. am: 1522691d1d am: c2e9c0f0fc...
Tao Bao [Mon, 28 Nov 2016 22:16:10 +0000 (22:16 +0000)]
build_verity_metadata: Support --signer_args argument. am: 1522691d1d am: c2e9c0f0fc am: c681cb32b3
am: b91b1cd229  -s ours

Change-Id: I215a06b68f54322c4b7b2966d7f6ca626f6d7a66

7 years agoMerge "simpleperf: fix a check error." am: 89bf4d4276 am: a2f8d9cbbd
Yabin Cui [Wed, 23 Nov 2016 01:43:59 +0000 (01:43 +0000)]
Merge "simpleperf: fix a check error." am: 89bf4d4276 am: a2f8d9cbbd
am: ef26fda84d

Change-Id: I3d349113998b423764d71d489029811a6bf550ba

7 years agoMerge "simpleperf: fix a check error." am: 89bf4d4276
Yabin Cui [Wed, 23 Nov 2016 01:41:57 +0000 (01:41 +0000)]
Merge "simpleperf: fix a check error." am: 89bf4d4276
am: a2f8d9cbbd

Change-Id: Ia2b9084cc471eab895db31a509e73eb30234d441

7 years agoMerge "simpleperf: fix a check error."
Yabin Cui [Wed, 23 Nov 2016 01:39:28 +0000 (01:39 +0000)]
Merge "simpleperf: fix a check error."
am: 89bf4d4276

Change-Id: I4478c64282ab9804f1790fee7e1a6609478562d2

7 years agoMerge "simpleperf: fix a check error."
Yabin Cui [Wed, 23 Nov 2016 01:36:35 +0000 (01:36 +0000)]
Merge "simpleperf: fix a check error."

7 years agosimpleperf: fix a check error.
Yabin Cui [Tue, 22 Nov 2016 23:32:03 +0000 (15:32 -0800)]
simpleperf: fix a check error.

Bug: None.
Test: `simpleperf record` a sleep process.
Change-Id: I334e9fb857743c63bf0a0b4b50f1a723d47ba6e7

7 years agoDO NOT MERGE verity_verifier: Support verifying images with FEC.
Tao Bao [Tue, 18 Oct 2016 20:02:14 +0000 (13:02 -0700)]
DO NOT MERGE verity_verifier: Support verifying images with FEC.

The current VerityVerifier.jar cannot verify verity images with FEC
metadata (since N). Replace it with a new verity verifier that uses
libfec to parse and verify verity metadata.

It accepts the same command line arguments as the old verity_verifier
script.

Usage: verity_verifier <image> -mincrypt <verity_key>
  image       the image file (raw or sparse image) to be verified
  verity_key  the verity key in mincrypt format (/verity_key on device)

Note: this is a backport of commit
bb634ff8dab6327bd38eadee22d5f8ec9d3940d0. It uses the mincrypt headers
and functions instead.

Bug: 32173582
Test: $ verity_verifier $OUT/system.img -mincrypt $OUT/root/verity_key
      VERIFIED
Change-Id: I8624973715dcd0f6d89d408c1c97bf584b50ce06
(cherry picked from commit bb634ff8dab6327bd38eadee22d5f8ec9d3940d0)

7 years agoMerge "cts: android.kernel.config drop v2" am: edb18846b8 am: 377daa8c61
Mark Salyzyn [Tue, 22 Nov 2016 19:10:22 +0000 (19:10 +0000)]
Merge "cts: android.kernel.config drop v2" am: edb18846b8 am: 377daa8c61
am: e2cd91046a

Change-Id: I65f4957e3ad7c29afeffaf297fda2ec1ab399af0

7 years agoMerge "cts: android.kernel.config drop v2" am: edb18846b8
Mark Salyzyn [Tue, 22 Nov 2016 19:07:22 +0000 (19:07 +0000)]
Merge "cts: android.kernel.config drop v2" am: edb18846b8
am: 377daa8c61

Change-Id: Ifcc90e269e8cd00353457907159c2a2887a1688a

7 years agoMerge "cts: android.kernel.config drop v2"
Mark Salyzyn [Tue, 22 Nov 2016 19:04:54 +0000 (19:04 +0000)]
Merge "cts: android.kernel.config drop v2"
am: edb18846b8

Change-Id: I5c74eb13ccfe2a475dbad0cb66dadde38d8d5249

7 years agoMerge "cts: android.kernel.config drop v2"
Mark Salyzyn [Tue, 22 Nov 2016 19:01:23 +0000 (19:01 +0000)]
Merge "cts: android.kernel.config drop v2"

7 years agotime test reclassification as gTest
Mark Salyzyn [Thu, 14 Jan 2016 17:20:47 +0000 (09:20 -0800)]
time test reclassification as gTest

Test: compile
Bug: 26559308
Change-Id: I2198f8b580f5302bd3ca015a86fcd04e680765ee

7 years agosystem/extras: Replace cutils/log.h with android/log.h or log/log.h
Mark Salyzyn [Thu, 29 Sep 2016 17:50:27 +0000 (10:50 -0700)]
system/extras: Replace cutils/log.h with android/log.h or log/log.h

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

7 years agocts: android.kernel.config drop v2
Mark Salyzyn [Mon, 4 Apr 2016 14:37:27 +0000 (07:37 -0700)]
cts: android.kernel.config drop v2

Test: cts: android.kernel.config
Bug: 19173869
Change-Id: If5c600ad7d261d94d424ae948314fec79bd69828

7 years agoMerge "Remove unnecessary reinterpret_cast" am: 71a681b891 am: b01eb15e91
Dimitry Ivanov [Tue, 22 Nov 2016 02:15:45 +0000 (02:15 +0000)]
Merge "Remove unnecessary reinterpret_cast" am: 71a681b891 am: b01eb15e91
am: c1af8a7449

Change-Id: I7c0d9a68786a178e6cf3206c179760f05d1eff82

7 years agoMerge "Remove unnecessary reinterpret_cast" am: 71a681b891
Dimitry Ivanov [Tue, 22 Nov 2016 02:13:14 +0000 (02:13 +0000)]
Merge "Remove unnecessary reinterpret_cast" am: 71a681b891
am: b01eb15e91

Change-Id: Id3cd5da8790f07af8a1e2d440ba4e31828aa0fb0

7 years agoMerge "Remove unnecessary reinterpret_cast"
Dimitry Ivanov [Tue, 22 Nov 2016 02:11:18 +0000 (02:11 +0000)]
Merge "Remove unnecessary reinterpret_cast"
am: 71a681b891

Change-Id: I0a7cbc220c82dae4a7ff6fc20a38c7632b459df4

7 years agoMerge "Remove unnecessary reinterpret_cast"
Dimitry Ivanov [Tue, 22 Nov 2016 02:07:18 +0000 (02:07 +0000)]
Merge "Remove unnecessary reinterpret_cast"

7 years agoRemove unnecessary reinterpret_cast
Dimitry Ivanov [Mon, 21 Nov 2016 22:29:56 +0000 (14:29 -0800)]
Remove unnecessary reinterpret_cast

Test: mm
Change-Id: I4187b6eebcb093d15e2768da95edd069f7990130

7 years agoDO NOT MERGE: libfec: allow fec_header to be located anywhere am: 549f048fcb
Sami Tolvanen [Mon, 21 Nov 2016 19:11:57 +0000 (19:11 +0000)]
DO NOT MERGE: libfec: allow fec_header to be located anywhere am: 549f048fcb
am: cb747ace50

Change-Id: Ied4e179d9dde0785667e2b94373c0e36868bf808

7 years agoDO NOT MERGE: fec: add --padding am: 61fce29c45
Sami Tolvanen [Mon, 21 Nov 2016 19:11:55 +0000 (19:11 +0000)]
DO NOT MERGE: fec: add --padding am: 61fce29c45
am: 8a05232e6a

Change-Id: Ie60d3840f6e6672dab27eb44d90536785eabc2aa

7 years agoDO NOT MERGE: fec: remove unneeded target executable am: 955d3afe95
Sami Tolvanen [Mon, 21 Nov 2016 19:11:52 +0000 (19:11 +0000)]
DO NOT MERGE: fec: remove unneeded target executable am: 955d3afe95
am: 4f492d7c7d  -s ours

Change-Id: I8851cd9409a13ddfac8c0b70cab2f7edf6ccc10c

7 years agoDO NOT MERGE: fec: remove unused mmap code am: cace33a52a
Sami Tolvanen [Mon, 21 Nov 2016 19:11:49 +0000 (19:11 +0000)]
DO NOT MERGE: fec: remove unused mmap code am: cace33a52a
am: f56944532e  -s ours

Change-Id: Ic73c3b352b9a7039ec815047c4d233362895e0a1

7 years agoDO NOT MERGE: libfec: allow fec_header to be located anywhere
Sami Tolvanen [Sun, 20 Nov 2016 06:27:03 +0000 (06:27 +0000)]
DO NOT MERGE: libfec: allow fec_header to be located anywhere
am: 549f048fcb

Change-Id: Ie9b58e09558995ccd52004e82add513483df5d69

7 years agoDO NOT MERGE: fec: add --padding
Sami Tolvanen [Sun, 20 Nov 2016 06:27:01 +0000 (06:27 +0000)]
DO NOT MERGE: fec: add --padding
am: 61fce29c45

Change-Id: Ia302825abf17edc824a37cd3085f02946deb9d12

7 years agoDO NOT MERGE: fec: remove unneeded target executable
Sami Tolvanen [Sun, 20 Nov 2016 06:26:59 +0000 (06:26 +0000)]
DO NOT MERGE: fec: remove unneeded target executable
am: 955d3afe95

Change-Id: Iaf46fa50e6944376497520a191518b7ba916cae9

7 years agoDO NOT MERGE: fec: remove unused mmap code
Sami Tolvanen [Sun, 20 Nov 2016 06:26:58 +0000 (06:26 +0000)]
DO NOT MERGE: fec: remove unused mmap code
am: cace33a52a

Change-Id: I8597822eb5f71f001d8ce2ac651c641d4f3a1030

7 years agoDO NOT MERGE: libfec: allow fec_header to be located anywhere
Sami Tolvanen [Thu, 1 Sep 2016 22:51:12 +0000 (15:51 -0700)]
DO NOT MERGE: libfec: allow fec_header to be located anywhere

Don't require fec_header to be immediately after ECC data.

Bug: 28865197
Bug: 32789520
Change-Id: Ie8faeeb07c35e2593553f7678762aae7f14c2ff7

(cherrypicked from commit d9fd5b0d7507877ad6a0ede10c473fe2970d278d)

7 years agoDO NOT MERGE: fec: add --padding
Sami Tolvanen [Thu, 1 Sep 2016 21:54:09 +0000 (14:54 -0700)]
DO NOT MERGE: 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
Bug: 32789520
Change-Id: I8c11401df56d15362fe3eb3c2a6a91ea82b02a83

(cherrypicked from commit 85e592cb86c9cbca82852240f0148adbee1b74e8)

7 years agoDO NOT MERGE: fec: remove unneeded target executable
Sami Tolvanen [Thu, 1 Sep 2016 20:43:51 +0000 (13:43 -0700)]
DO NOT MERGE: fec: remove unneeded target executable

Bug: 32789520

Change-Id: Ic925814191b8ac952b584a994cf455f871a8ee0c

(cherrypicked from commit 4c716c92a691e6b39e8e65a397f9b6e91f9e07ee)

7 years agoMerge "simpleperf: fix dumping arm regs on arm64 devices." am: 7c0d6db3cf am: ad52fbe650
Yabin Cui [Sat, 19 Nov 2016 02:05:53 +0000 (02:05 +0000)]
Merge "simpleperf: fix dumping arm regs on arm64 devices." am: 7c0d6db3cf am: ad52fbe650
am: 71954e996c

Change-Id: I00516fc7ea44579e72452a7e34f39cee0be9cead

7 years agoMerge "simpleperf: fix dumping arm regs on arm64 devices." am: 7c0d6db3cf
Yabin Cui [Sat, 19 Nov 2016 02:01:53 +0000 (02:01 +0000)]
Merge "simpleperf: fix dumping arm regs on arm64 devices." am: 7c0d6db3cf
am: ad52fbe650

Change-Id: Ib87cac0b0495fdd25849a7fa51325950b6e20fdc

7 years agoMerge "simpleperf: fix dumping arm regs on arm64 devices."
Yabin Cui [Sat, 19 Nov 2016 01:58:23 +0000 (01:58 +0000)]
Merge "simpleperf: fix dumping arm regs on arm64 devices."
am: 7c0d6db3cf

Change-Id: I8fb140f3e754de6aeb3043379bb61d666a0d84b9

7 years agoMerge "simpleperf: fix dumping arm regs on arm64 devices."
Yabin Cui [Sat, 19 Nov 2016 01:53:03 +0000 (01:53 +0000)]
Merge "simpleperf: fix dumping arm regs on arm64 devices."

7 years agoMerge "ext4_utils: Remove signed/unsigned comparison warnings" am: 2417cf79ce am...
Dmitry Shmidt [Sat, 19 Nov 2016 01:46:36 +0000 (01:46 +0000)]
Merge "ext4_utils: Remove signed/unsigned comparison warnings" am: 2417cf79ce am: efd86cef98
am: 920aae83f3

Change-Id: I95d212574716362296fefc4b55c80682c009361a

7 years agoMerge "ext4_utils: Remove signed/unsigned comparison warnings" am: 2417cf79ce
Dmitry Shmidt [Sat, 19 Nov 2016 01:43:06 +0000 (01:43 +0000)]
Merge "ext4_utils: Remove signed/unsigned comparison warnings" am: 2417cf79ce
am: efd86cef98

Change-Id: I1e46259510cc8b99ba591909a5a92af68d253aa8

7 years agoMerge "ext4_utils: Remove signed/unsigned comparison warnings"
Dmitry Shmidt [Sat, 19 Nov 2016 01:39:36 +0000 (01:39 +0000)]
Merge "ext4_utils: Remove signed/unsigned comparison warnings"
am: 2417cf79ce

Change-Id: If02f2a3097918bc5474b1f568cba08a748748956

7 years agoMerge "ext4_utils: Remove signed/unsigned comparison warnings"
Treehugger Robot [Sat, 19 Nov 2016 01:32:21 +0000 (01:32 +0000)]
Merge "ext4_utils: Remove signed/unsigned comparison warnings"