OSDN Git Service
Adrien Schildknecht [Sat, 3 Dec 2016 04:20:11 +0000 (04:20 +0000)]
Manually merge commit '
bf03f2e' into stage-aosp-master am:
a083ba6a48 am:
298394ac68
am:
822c2b6e07
Change-Id: I3682e1a156e0c5740b57f51a42c5d2b3f96f92a8
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
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
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
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
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
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
Yabin Cui [Wed, 30 Nov 2016 20:05:31 +0000 (20:05 +0000)]
Merge "simpleperf: improve script interface." am:
090785e4dd am:
72fc75c1f7 am:
bb4366201f
am:
22570fa2ec
Change-Id: Id9f23a2389b957833a9df376ea50bbb4261e209e
Connor O'Brien [Wed, 30 Nov 2016 20:05:20 +0000 (20:05 +0000)]
Merge "Rewrite bootctl utility to use new HAL interface" am:
1bc97843cb am:
fe9d980924 am:
72332cb51b
am:
75e2751488
Change-Id: I6a5f511ee6de34d1138446e17ef6c98c2eec3829
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
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
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
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
Yabin Cui [Wed, 30 Nov 2016 19:49:51 +0000 (19:49 +0000)]
Merge "simpleperf: improve script interface."
am:
090785e4dd
Change-Id: I6536a2764eed1b614628028fccb6a79477208268
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
Yabin Cui [Wed, 30 Nov 2016 19:39:53 +0000 (19:39 +0000)]
Merge "simpleperf: improve script interface."
Connor O'Brien [Wed, 30 Nov 2016 19:33:34 +0000 (19:33 +0000)]
Merge "Rewrite bootctl utility to use new HAL interface"
Yabin Cui [Wed, 30 Nov 2016 18:10:33 +0000 (18:10 +0000)]
Merge "simpleperf: fix tests for dwarf callgraph unwinding." am:
35f8849075 am:
ed3ee52f81 am:
fe39f81b95
am:
9623e09ae5
Change-Id: I96bc3345e092be4b9e29c3928de5286630c88e72
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
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
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
Yabin Cui [Wed, 30 Nov 2016 17:41:27 +0000 (17:41 +0000)]
Merge "simpleperf: fix tests for dwarf callgraph unwinding."
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
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>
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
Yabin Cui [Tue, 29 Nov 2016 20:07:55 +0000 (20:07 +0000)]
Merge "simpleperf: add stuff in report_lib_interface." am:
c11a58e701 am:
016ac14879 am:
969472af65
am:
9e2eab76be
Change-Id: Ifbb27fe6c83ea2540fb1ec25fc05d3395505eb7e
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
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
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
Yabin Cui [Tue, 29 Nov 2016 19:46:07 +0000 (19:46 +0000)]
Merge "simpleperf: add stuff in report_lib_interface."
Tao Bao [Tue, 29 Nov 2016 18:29:17 +0000 (18:29 +0000)]
DO NOT MERGE verity_verifier: Support verifying images with FEC. am:
989f6a13a7 am:
533ed53bc0 am:
3734580187 am:
69dd400b72 -s ours am:
1bec234d84
am:
8282e56528 -s ours
Change-Id: I76672d3f842655d08f98910bc459620c2a9c9a86
Tao Bao [Tue, 29 Nov 2016 18:29:06 +0000 (18:29 +0000)]
DO NOT MERGE verity_verifier: Support verifying images with FEC. am:
989f6a13a7 am:
533ed53bc0 am:
3734580187 am:
69dd400b72 am:
378116f05a -s ours
am:
1db7b34fa5 -s ours
Change-Id: I7abd967dac1e1a24f4eed9eb632bf2dba4fd35f7
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
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
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
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
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
Mark Salyzyn [Tue, 29 Nov 2016 18:04:17 +0000 (18:04 +0000)]
Merge changes I2198f8b5,I245c859e am:
c3fbd8b936 am:
af3938ae34 am:
3d4318fdf6
am:
b5fee4acfd
Change-Id: I9d16fc734bbde1ebc0547b822e6651dfb6a5363c
Mark Salyzyn [Tue, 29 Nov 2016 18:04:15 +0000 (18:04 +0000)]
time test reclassification as gTest am:
11a438be18 am:
0ceab28690 am:
40ae93af53
am:
1257e26e37
Change-Id: Ifd9aa11c37109a90a3fbb26005f3b858cc89f3f0
Mark Salyzyn [Tue, 29 Nov 2016 18:04:12 +0000 (18:04 +0000)]
system/extras: Replace cutils/log.h with android/log.h or log/log.h am:
3d66aa307e am:
55925a0a50 am:
1ce37777ee
am:
a383bf437b
Change-Id: I6a594a5bd69375e92ea37de75acadbf30af84ae4
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
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
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
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
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
Mark Salyzyn [Tue, 29 Nov 2016 17:54:46 +0000 (17:54 +0000)]
Merge changes I2198f8b5,I245c859e am:
c3fbd8b936
am:
af3938ae34
Change-Id: I9092e5733eb6e861ed7631e77ea6968260159de8
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
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
Mark Salyzyn [Tue, 29 Nov 2016 17:50:14 +0000 (17:50 +0000)]
Merge changes I2198f8b5,I245c859e
am:
c3fbd8b936
Change-Id: I8a765ad6d12ea8450fba6f229e564b0a40007c15
Mark Salyzyn [Tue, 29 Nov 2016 17:50:13 +0000 (17:50 +0000)]
time test reclassification as gTest
am:
11a438be18
Change-Id: I06539c7e894be9a1739779f97fb31ec6f1e672b1
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
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
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
Sami Tolvanen [Tue, 29 Nov 2016 00:15:31 +0000 (00:15 +0000)]
DO NOT MERGE: libfec: allow fec_header to be located anywhere am:
549f048fcb am:
3050f05110
am:
66ed40d4c1 -s ours
Change-Id: I413353996a221ae71137899d5c38f937213aa86a
Sami Tolvanen [Tue, 29 Nov 2016 00:15:26 +0000 (00:15 +0000)]
DO NOT MERGE: fec: add --padding am:
61fce29c45 am:
867093305e
am:
7ce0727615 -s ours
Change-Id: I72abc8c04a75d81448a175bca9fb8b2d8b5d6d67
Sami Tolvanen [Tue, 29 Nov 2016 00:15:23 +0000 (00:15 +0000)]
DO NOT MERGE: fec: remove unneeded target executable am:
955d3afe95 -s ours am:
4ab0c5b6f7
am:
f16360fa50 -s ours
Change-Id: I69cf604d219c747dfcbfe440ec6aca4410f922ca
Sami Tolvanen [Tue, 29 Nov 2016 00:15:20 +0000 (00:15 +0000)]
DO NOT MERGE: fec: remove unused mmap code am:
cace33a52a -s ours am:
ca87aaab7d
am:
26e4ba751b -s ours
Change-Id: Iba0a5a627c4f8ebe796cb4f126d7fef7ba3388d4
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
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
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
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
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
Sami Tolvanen [Tue, 29 Nov 2016 00:05:52 +0000 (00:05 +0000)]
DO NOT MERGE: fec: add --padding
am:
61fce29c45
Change-Id: I7c72ae76f73d5c8c48220f6f606722e3b1cd8287
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
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
Tao Bao [Mon, 28 Nov 2016 22:36:03 +0000 (22:36 +0000)]
build_verity_metadata: Support --signer_args argument. am:
1522691d1d am:
c2e9c0f0fc am:
c681cb32b3 am:
b91b1cd229 -s ours am:
c757ed045b
am:
31f79f1103
Change-Id: If6883072a5fdab02623d11e2d8c461f26ecbc668
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
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
Yabin Cui [Wed, 23 Nov 2016 01:52:12 +0000 (01:52 +0000)]
Merge "simpleperf: fix a check error." am:
89bf4d4276 am:
a2f8d9cbbd am:
ef26fda84d
am:
8326341143
Change-Id: I7b34a9f7186ba57805a27bfb53ec38515e94fc5f
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
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
Yabin Cui [Wed, 23 Nov 2016 01:39:28 +0000 (01:39 +0000)]
Merge "simpleperf: fix a check error."
am:
89bf4d4276
Change-Id: I4478c64282ab9804f1790fee7e1a6609478562d2
Yabin Cui [Wed, 23 Nov 2016 01:36:35 +0000 (01:36 +0000)]
Merge "simpleperf: 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
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)
Mark Salyzyn [Tue, 22 Nov 2016 19:12:52 +0000 (19:12 +0000)]
Merge "cts: android.kernel.config drop v2" am:
edb18846b8 am:
377daa8c61 am:
e2cd91046a
am:
e636bd18b1
Change-Id: I8f91dbe5d01982952b10999dbdd30e6b706a1bb7
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
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
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
Mark Salyzyn [Tue, 22 Nov 2016 19:01:23 +0000 (19:01 +0000)]
Merge "cts: android.kernel.config drop v2"
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
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
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
Dimitry Ivanov [Tue, 22 Nov 2016 02:26:27 +0000 (02:26 +0000)]
Merge "Remove unnecessary reinterpret_cast" am:
71a681b891 am:
b01eb15e91 am:
c1af8a7449
am:
11df60d723
Change-Id: Id65857445e06db89c97fb450f37c99a0c3a40ed8
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
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
Dimitry Ivanov [Tue, 22 Nov 2016 02:11:18 +0000 (02:11 +0000)]
Merge "Remove unnecessary reinterpret_cast"
am:
71a681b891
Change-Id: I0a7cbc220c82dae4a7ff6fc20a38c7632b459df4
Dimitry Ivanov [Tue, 22 Nov 2016 02:07:18 +0000 (02:07 +0000)]
Merge "Remove 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
Sami Tolvanen [Mon, 21 Nov 2016 19:17:00 +0000 (19:17 +0000)]
DO NOT MERGE: libfec: allow fec_header to be located anywhere am:
549f048fcb am:
cb747ace50
am:
da37789555 -s ours
Change-Id: Ica6b4c09419d98b67c76a49181c13217afabea77
Sami Tolvanen [Mon, 21 Nov 2016 19:16:56 +0000 (19:16 +0000)]
DO NOT MERGE: fec: add --padding am:
61fce29c45 am:
8a05232e6a
am:
a29dc4cac6 -s ours
Change-Id: I4ddf89bb64c360423436bee7d1d6ad2cad96862c
Sami Tolvanen [Mon, 21 Nov 2016 19:16:51 +0000 (19:16 +0000)]
DO NOT MERGE: fec: remove unneeded target executable am:
955d3afe95 am:
4f492d7c7d -s ours
am:
c91b763488 -s ours
Change-Id: I84d3afe1a44b37cf2f4159e60c6f79996fcaf6fd
Sami Tolvanen [Mon, 21 Nov 2016 19:16:48 +0000 (19:16 +0000)]
DO NOT MERGE: fec: remove unused mmap code am:
cace33a52a am:
f56944532e -s ours
am:
27ee74b473 -s ours
Change-Id: I5add066f13f2521d338f20a7e77d3c269b5b468f
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
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
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
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
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
Sami Tolvanen [Sun, 20 Nov 2016 06:27:01 +0000 (06:27 +0000)]
DO NOT MERGE: fec: add --padding
am:
61fce29c45
Change-Id: Ia302825abf17edc824a37cd3085f02946deb9d12
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
OSDN Git Service
