OSDN Git Service
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
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 [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
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
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)
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)
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)
Yabin Cui [Sat, 19 Nov 2016 02:10:10 +0000 (02:10 +0000)]
Merge "simpleperf: fix dumping arm regs on arm64 devices." am:
7c0d6db3cf am:
ad52fbe650 am:
71954e996c
am:
3be8e6ade8
Change-Id: If44874c31d5cea23b96166b62c292daf614ced4e
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
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
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
Yabin Cui [Sat, 19 Nov 2016 01:53:03 +0000 (01:53 +0000)]
Merge "simpleperf: fix dumping arm regs on arm64 devices."
Dmitry Shmidt [Sat, 19 Nov 2016 01:50:24 +0000 (01:50 +0000)]
Merge "ext4_utils: Remove signed/unsigned comparison warnings" am:
2417cf79ce am:
efd86cef98 am:
920aae83f3
am:
43417e6c8e
Change-Id: I6a7badcc5130ba62c2332747da19b7f23b4affed
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
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
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
Treehugger Robot [Sat, 19 Nov 2016 01:32:21 +0000 (01:32 +0000)]
Merge "ext4_utils: Remove signed/unsigned comparison warnings"
Tao Bao [Sat, 19 Nov 2016 00:08:36 +0000 (00:08 +0000)]
Merge "verity_verifier: Support verifying images with FEC." am:
89ac10269e am:
a5e2880ed3 am:
b65173f6f8
am:
06c1323e2f
Change-Id: Ia2c47f24997ce890f8f24732d9c1039150d695dd
Tao Bao [Sat, 19 Nov 2016 00:04:32 +0000 (00:04 +0000)]
Merge "verity_verifier: Support verifying images with FEC." am:
89ac10269e am:
a5e2880ed3
am:
b65173f6f8
Change-Id: Iaf8f86d9c2f0e743ed32b7cb0f68bfd37f84bd6f
Tao Bao [Sat, 19 Nov 2016 00:00:29 +0000 (00:00 +0000)]
Merge "verity_verifier: Support verifying images with FEC." am:
89ac10269e
am:
a5e2880ed3
Change-Id: I25ff34271e2c159bf21911bc944a0bfaf488d7e9
Tao Bao [Fri, 18 Nov 2016 23:57:27 +0000 (23:57 +0000)]
Merge "verity_verifier: Support verifying images with FEC."
am:
89ac10269e
Change-Id: Ia8742c9b5773f80d4877dcee5b293bbe289cc41e
Tao Bao [Fri, 18 Nov 2016 23:48:11 +0000 (23:48 +0000)]
Merge "verity_verifier: Support verifying images with FEC."
Dmitry Shmidt [Fri, 18 Nov 2016 23:38:47 +0000 (15:38 -0800)]
ext4_utils: Remove signed/unsigned comparison warnings
Bug:
33012393
Test: Manual
Change-Id: I18e442cb27f28be491b0ef6f620ba4fa0fad6713
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Tao Bao [Tue, 18 Oct 2016 20:02:14 +0000 (13:02 -0700)]
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)
Bug:
32173582
Test: $ verity_verifier $OUT/system.img -mincrypt $OUT/root/verity_key
VERIFIED
Change-Id: I8624973715dcd0f6d89d408c1c97bf584b50ce06
Daniel Friederich [Thu, 17 Nov 2016 23:28:23 +0000 (23:28 +0000)]
Merge "Support to use kallsyms" am:
53f91652de am:
a38b2ff9fd am:
aa90a389dc
am:
357252ea93
Change-Id: I22d7e7baed5ce8436c7dc5dd16b30821cb22d085
Daniel Friederich [Thu, 17 Nov 2016 23:12:59 +0000 (23:12 +0000)]
Merge "Support to use kallsyms" am:
53f91652de am:
a38b2ff9fd
am:
aa90a389dc
Change-Id: I2332e7783286d1b0177eb275ecb742308155f8ee
Daniel Friederich [Thu, 17 Nov 2016 22:58:04 +0000 (22:58 +0000)]
Merge "Support to use kallsyms" am:
53f91652de
am:
a38b2ff9fd
Change-Id: I82019514912368097ac1d9445f22d05d0b6dbb1b
Daniel Friederich [Thu, 17 Nov 2016 22:42:54 +0000 (22:42 +0000)]
Merge "Support to use kallsyms"
am:
53f91652de
Change-Id: Idfd6cf053e2ecd4a56c6cfa1b39b0d46d30db78c
Treehugger Robot [Thu, 17 Nov 2016 22:13:13 +0000 (22:13 +0000)]
Merge "Support to use kallsyms"
Yabin Cui [Wed, 16 Nov 2016 20:26:13 +0000 (12:26 -0800)]
simpleperf: fix dumping arm regs on arm64 devices.
On arm64 devices, the kernel dumps arm64 regs
even for 32-bit processes. So we need to map
from arm64 registers to arm registers.
Bug: http://b/
30974693
Test: run simpleperf manually on one app.
Change-Id: Iffeac9510b418b5dabc0604c16523887d63bba49
Yabin Cui [Thu, 17 Nov 2016 02:13:44 +0000 (02:13 +0000)]
Merge "Revert "Revert "simpleperf: use libprocinfo.""" am:
960a81aaeb am:
4d5775380e am:
0332ebe140
am:
a062a21f54
Change-Id: Idef558c285ce0e9fe95c069a40cc3820b857ec7d
Yabin Cui [Thu, 17 Nov 2016 02:05:02 +0000 (02:05 +0000)]
Merge "Revert "Revert "simpleperf: use libprocinfo.""" am:
960a81aaeb am:
4d5775380e
am:
0332ebe140
Change-Id: I93e408a3eae2ba00ad118850513cf5d63eda09ea
Yabin Cui [Thu, 17 Nov 2016 01:57:32 +0000 (01:57 +0000)]
Merge "Revert "Revert "simpleperf: use libprocinfo.""" am:
960a81aaeb
am:
4d5775380e
Change-Id: I5c7678d653518a7418c0bbabd6198032ab226ff2
Yabin Cui [Thu, 17 Nov 2016 01:50:32 +0000 (01:50 +0000)]
Merge "Revert "Revert "simpleperf: use libprocinfo."""
am:
960a81aaeb
Change-Id: I8e9819f630828a7cf03ec189050a5b3ee353ad1c
Yabin Cui [Thu, 17 Nov 2016 01:38:12 +0000 (01:38 +0000)]
Merge "Revert "Revert "simpleperf: use libprocinfo."""
Yabin Cui [Thu, 17 Nov 2016 01:29:49 +0000 (01:29 +0000)]
Merge "simpleperf: update readme." am:
3bee5e326a am:
106b61434c am:
d9647620fd
am:
f18ce18faf
Change-Id: I0258e46b90736fa6ccfa2090fdfdccf9e996b34f
Yabin Cui [Thu, 17 Nov 2016 01:04:58 +0000 (01:04 +0000)]
Merge "simpleperf: update readme." am:
3bee5e326a am:
106b61434c
am:
d9647620fd
Change-Id: Ieb989f6e41883bf62b0583e3111fd15c196a2228
Yabin Cui [Thu, 17 Nov 2016 00:57:02 +0000 (00:57 +0000)]
Merge "simpleperf: update readme." am:
3bee5e326a
am:
106b61434c
Change-Id: Ib5b7534743ead1df5ca8e630fab5a28e628c02a3
Yabin Cui [Thu, 17 Nov 2016 00:50:27 +0000 (00:50 +0000)]
Merge "simpleperf: update readme."
am:
3bee5e326a
Change-Id: Ic33ffdf23ba356543108790fd66e8d05bdc3a6d5
Yabin Cui [Thu, 17 Nov 2016 00:37:40 +0000 (00:37 +0000)]
Merge "simpleperf: update readme."
Yabin Cui [Wed, 16 Nov 2016 22:47:53 +0000 (22:47 +0000)]
Revert "Revert "simpleperf: use libprocinfo.""
This reverts commit
49bdb3d52dec84a715159c325748e5f15d69b9ce.
Change-Id: Ib9c061cc3b3fbcadfb6fdd1a25050644a9dae4e2
Yabin Cui [Wed, 16 Nov 2016 22:15:30 +0000 (14:15 -0800)]
simpleperf: update readme.
Test: none.
Change-Id: Ic4f15dc3dec11e75de01a9ef537be915602962bd
Tao Bao [Wed, 16 Nov 2016 22:07:28 +0000 (22:07 +0000)]
Merge "tests/framebuffer: Remove dead minui.h." am:
c2f3086b91 am:
30d2123f24 am:
ccdfda0210
am:
fa983d87c5
Change-Id: If5a798686cd2c23bd565159e7dcbd965845d7951
Tao Bao [Wed, 16 Nov 2016 21:59:57 +0000 (21:59 +0000)]
Merge "tests/framebuffer: Remove dead minui.h." am:
c2f3086b91 am:
30d2123f24
am:
ccdfda0210
Change-Id: Id36bd4e8393edae0b379f65ff84bfd71dc93c341
Tao Bao [Wed, 16 Nov 2016 21:52:27 +0000 (21:52 +0000)]
Merge "tests/framebuffer: Remove dead minui.h." am:
c2f3086b91
am:
30d2123f24
Change-Id: Ia057eb4f43a4d5b4941dac98f61e9525c0208e98
Tao Bao [Wed, 16 Nov 2016 21:44:59 +0000 (21:44 +0000)]
Merge "tests/framebuffer: Remove dead minui.h."
am:
c2f3086b91
Change-Id: Idd29119b500d35066f0c0bfdc682e22e07044e4e
Treehugger Robot [Wed, 16 Nov 2016 21:37:59 +0000 (21:37 +0000)]
Merge "tests/framebuffer: Remove dead minui.h."
Tao Bao [Wed, 16 Nov 2016 20:00:22 +0000 (20:00 +0000)]
tests/framebuffer: Remove dead minui.h. am:
43ef74b2e3 am:
a6b0b083a7
am:
d73f1de7b8
Change-Id: I435882e8434157d67aeab53423c774f745c6d9af
Tao Bao [Wed, 16 Nov 2016 19:44:17 +0000 (19:44 +0000)]
tests/framebuffer: Remove dead minui.h. am:
43ef74b2e3
am:
a6b0b083a7
Change-Id: Ibc46f13fd378cc7c612523a7d01cfd432aecf8ea
Tao Bao [Wed, 16 Nov 2016 19:37:16 +0000 (19:37 +0000)]
tests/framebuffer: Remove dead minui.h.
am:
43ef74b2e3
Change-Id: I6383fa534ca9bca9cb9e31a1df4fc9de6ff8a572
Tao Bao [Tue, 15 Nov 2016 22:46:25 +0000 (14:46 -0800)]
tests/framebuffer: Remove dead minui.h.
commit
480a3b1c6d5413e06775a9d53cb1596535fd91ae removed the last user of
this local minui.h copy in 2011.
Test: mmma system/extras/tests/framebuffer
Change-Id: Iee42ef604616dc539d4a1699ada7209c48c3bcd9
(cherry picked from commit
12c8e9996232b3b41ebe9b3fe1c288823c77f292)
(cherry picked from commit
5eda75e963bae890e82c7112ce2d8a918e32ba4d)
Daniel Friederich [Mon, 17 Oct 2016 17:28:03 +0000 (12:28 -0500)]
Support to use kallsyms
Also:
- Adapt to use with Python 3
(where str is a wide type but our C API's expect 8 bit character strings)
- Use OS specific so names (e.g. simpleperf_report.dll on Windows)
- On Windows as we use mingw to build, preload libwinpthread-1.dll.
Test: with manual incovation using report_sample.py
Change-Id: Id973c463608c520b8eec229026c74dc5e8144cf8
Tao Bao [Tue, 15 Nov 2016 22:46:25 +0000 (14:46 -0800)]
tests/framebuffer: Remove dead minui.h.
commit
480a3b1c6d5413e06775a9d53cb1596535fd91ae removed the last user of
this local minui.h copy in 2011.
Test: mmma system/extras/tests/framebuffer
Change-Id: Iee42ef604616dc539d4a1699ada7209c48c3bcd9
(cherry picked from commit
12c8e9996232b3b41ebe9b3fe1c288823c77f292)
George Burgess IV [Wed, 16 Nov 2016 04:55:57 +0000 (04:55 +0000)]
Merge "Fix static-analyzer memory leak warnings." am:
ba27872adb am:
283c74c540 am:
c458028f69
am:
83ca015933
Change-Id: I5d09e7951892a0c0b3ff81d19f1c6167402db226
George Burgess IV [Wed, 16 Nov 2016 04:48:26 +0000 (04:48 +0000)]
Merge "Fix static-analyzer memory leak warnings." am:
ba27872adb am:
283c74c540
am:
c458028f69
Change-Id: I80adc93fc89e3722f6b14f3ef7d3ee82edcefeff
George Burgess IV [Wed, 16 Nov 2016 04:40:26 +0000 (04:40 +0000)]
Merge "Fix static-analyzer memory leak warnings." am:
ba27872adb
am:
283c74c540
Change-Id: Ib46eb54fb319d816ffcfdfa31a2cd38ae7886605
George Burgess IV [Wed, 16 Nov 2016 04:32:55 +0000 (04:32 +0000)]
Merge "Fix static-analyzer memory leak warnings."
am:
ba27872adb
Change-Id: I6c5bae9ad45b543ee2de35b7089fb4f40da888fb
Treehugger Robot [Wed, 16 Nov 2016 04:26:13 +0000 (04:26 +0000)]
Merge "Fix static-analyzer memory leak warnings."
zhang sanshan [Wed, 16 Nov 2016 03:39:45 +0000 (03:39 +0000)]
Merge "Fix kernel panic when boot up" am:
857a9f9a57 am:
a28eba452f am:
1baac7f713
am:
0c0a471c5c
Change-Id: I676d0f5da2c0ae7decacb356d91545fe4a092c58
zhang sanshan [Wed, 16 Nov 2016 03:32:41 +0000 (03:32 +0000)]
Merge "Fix kernel panic when boot up" am:
857a9f9a57 am:
a28eba452f
am:
1baac7f713
Change-Id: Ie30edf2efab3a202aa33520813e27f5d5e99f330
zhang sanshan [Wed, 16 Nov 2016 03:25:43 +0000 (03:25 +0000)]
Merge "Fix kernel panic when boot up" am:
857a9f9a57
am:
a28eba452f
Change-Id: I5c7dc9d6aeeefeef116eea216247b793d72a1c3e
zhang sanshan [Wed, 16 Nov 2016 03:17:40 +0000 (03:17 +0000)]
Merge "Fix kernel panic when boot up"
am:
857a9f9a57
Change-Id: Iee390ee0b79b852b2f40f0482ab7e537715745a1
Treehugger Robot [Wed, 16 Nov 2016 03:08:01 +0000 (03:08 +0000)]
Merge "Fix kernel panic when boot up"
Tao Bao [Tue, 15 Nov 2016 22:46:25 +0000 (14:46 -0800)]
tests/framebuffer: Remove dead minui.h.
commit
480a3b1c6d5413e06775a9d53cb1596535fd91ae removed the last user of
this local minui.h copy in 2011.
Test: mmma system/extras/tests/framebuffer
Change-Id: Iee42ef604616dc539d4a1699ada7209c48c3bcd9
George Burgess IV [Tue, 15 Nov 2016 23:22:36 +0000 (15:22 -0800)]
Fix static-analyzer memory leak warnings.
system/extras/simpleperf/record_test.cpp:77:3: warning: Potential leak
of memory pointed to by 'r2'
system/extras/simpleperf/record_test.cpp:77:3: warning: Potential leak
of memory pointed to by 'r3'
system/extras/simpleperf/record_test.cpp:77:3: warning: Potential leak
of memory pointed to by 'r4'
Bug: None.
Test: Now builds without those warnings, and
`simpleperf_unit_test -t system/extras/simpleperf/testdata` passes.
Change-Id: Ie77955367efeeba13173e2542eba02727b298f86
Josh Gao [Tue, 15 Nov 2016 03:29:47 +0000 (03:29 +0000)]
Merge "Revert "simpleperf: use libprocinfo."" am:
40f79982a2 am:
94fc942291 am:
908f477c16
am:
96d6368e88
Change-Id: I6e3570fec87d811ed79f3e3e325d6b4383a690df
Josh Gao [Tue, 15 Nov 2016 03:21:38 +0000 (03:21 +0000)]
Merge "Revert "simpleperf: use libprocinfo."" am:
40f79982a2 am:
94fc942291
am:
908f477c16
Change-Id: Ie80299b0e81530ca6dea3650607ecf97d8b0e763
Josh Gao [Tue, 15 Nov 2016 03:14:59 +0000 (03:14 +0000)]
Merge "Revert "simpleperf: use libprocinfo."" am:
40f79982a2
am:
94fc942291
Change-Id: Ie5cc6d8cf5bdf0a0ef7c2a65891328ac3f79d0f3
Josh Gao [Tue, 15 Nov 2016 03:04:58 +0000 (03:04 +0000)]
Merge "Revert "simpleperf: use libprocinfo.""
am:
40f79982a2
Change-Id: I4e04c44c675e88fef6f990f76012fe6f96735528
Josh Gao [Tue, 15 Nov 2016 02:52:55 +0000 (02:52 +0000)]
Merge "Revert "simpleperf: use libprocinfo.""
Josh Gao [Tue, 15 Nov 2016 02:52:22 +0000 (02:52 +0000)]
Revert "simpleperf: use libprocinfo."
This reverts commit
7eb4f9bd77b82fc54f6396dd62be5655097e028a.
Change-Id: I5c7c25d2962678dd1a1ed9146eacd6880044ee45