OSDN Git Service
Yabin Cui [Wed, 3 May 2017 16:13:10 +0000 (16:13 +0000)]
Merge "simpleperf: Update doc for Android O." am:
c248f1f761 am:
f13c6fb305 am:
95a936e4ed
am:
ca09c0b55e
Change-Id: I48967a38b71b230abc29fbea87f80ad4559cf38b
Yabin Cui [Wed, 3 May 2017 16:08:38 +0000 (16:08 +0000)]
Merge "simpleperf: Update doc for Android O." am:
c248f1f761 am:
f13c6fb305
am:
95a936e4ed
Change-Id: I9adf029b3e5547e7b22f5d6b3e8f19852e7f41b8
Yabin Cui [Wed, 3 May 2017 16:06:35 +0000 (16:06 +0000)]
Merge "simpleperf: Update doc for Android O." am:
c248f1f761
am:
f13c6fb305
Change-Id: I7eb5136d0f0ae64acb243d9d1118e69350ba4c50
Yabin Cui [Wed, 3 May 2017 16:04:06 +0000 (16:04 +0000)]
Merge "simpleperf: Update doc for Android O."
am:
c248f1f761
Change-Id: I9008f6c30a8de6be3ec03a0b2ab88d7ecf34f8fd
Treehugger Robot [Wed, 3 May 2017 15:59:05 +0000 (15:59 +0000)]
Merge "simpleperf: Update doc for Android O."
Yabin Cui [Wed, 3 May 2017 00:32:54 +0000 (00:32 +0000)]
Merge "simpleperf: add 'event_count' field in report proto." am:
7d8e85589c am:
e848471461 am:
c6b0cf2cf3
am:
9ba61e5af1
Change-Id: I06bf2aab10b5b77d5408d00222c9ccc651d6449e
Yabin Cui [Wed, 3 May 2017 00:21:40 +0000 (00:21 +0000)]
Merge "simpleperf: add 'event_count' field in report proto." am:
7d8e85589c am:
e848471461
am:
c6b0cf2cf3
Change-Id: I4ad8d12950cb094d448a9ea3581c32e622297546
Yabin Cui [Wed, 3 May 2017 00:19:05 +0000 (00:19 +0000)]
Merge "simpleperf: add 'event_count' field in report proto." am:
7d8e85589c
am:
e848471461
Change-Id: I01bf0ba09668cc909dd43c7e59af8796a36efada
Yabin Cui [Wed, 3 May 2017 00:17:05 +0000 (00:17 +0000)]
Merge "simpleperf: add 'event_count' field in report proto."
am:
7d8e85589c
Change-Id: I3f4d7b6cbb28e2ef2f7b86c6047b4cf1b236a253
Yabin Cui [Wed, 3 May 2017 00:10:33 +0000 (00:10 +0000)]
Merge "simpleperf: add 'event_count' field in report proto."
Yabin Cui [Fri, 28 Apr 2017 17:44:16 +0000 (10:44 -0700)]
simpleperf: Update doc for Android O.
1. Refactor README.md:
a. Add menu.
b. Add `Tools in simpleperf` section.
c. Use real examples in `Android application profiling`,
add checks for how to prepare the application.
d. Link to examples workable on Android O.
2. Use `ps -e` instead of `ps` for Android O in app_profiler.py.
3. Remove a failed assert in annotate.py.
4. Upload demo projects.
Bug: http://b/
35157971
Test: follow examples on linux and mac.
Change-Id: Iab115bdca3d5abad56fcdc048ccc75f867f5bd6b
Yabin Cui [Tue, 2 May 2017 20:25:21 +0000 (13:25 -0700)]
simpleperf: add 'event_count' field in report proto.
Bug: http://b/
37294023
Test: run simpleperf_unit_test.
Change-Id: Ib16eec55512769a9a241c8ff054179d450488142
Yabin Cui [Sat, 29 Apr 2017 06:16:41 +0000 (06:16 +0000)]
Merge "simpleperf: fix unknown binary in samples." am:
8bc6d740bd am:
b06d9a0116 am:
2abc0dafae
am:
f066c6b2bc
Change-Id: Ic37a284ddb1e50a797a55a94890edc237026c55e
Yabin Cui [Sat, 29 Apr 2017 06:14:42 +0000 (06:14 +0000)]
Merge "simpleperf: fix unknown binary in samples." am:
8bc6d740bd am:
b06d9a0116
am:
2abc0dafae
Change-Id: I2190ad7e8b9c61388b6312a5df306557371dff89
Yabin Cui [Sat, 29 Apr 2017 06:12:40 +0000 (06:12 +0000)]
Merge "simpleperf: fix unknown binary in samples." am:
8bc6d740bd
am:
b06d9a0116
Change-Id: If684c3a4ae37dc20988015be7d90651500a5e380
Yabin Cui [Sat, 29 Apr 2017 06:10:10 +0000 (06:10 +0000)]
Merge "simpleperf: fix unknown binary in samples."
am:
8bc6d740bd
Change-Id: I7d39b74fd509de6eeaabc558d89f12ff846af282
Yabin Cui [Sat, 29 Apr 2017 06:05:40 +0000 (06:05 +0000)]
Merge "simpleperf: fix unknown binary in samples."
Yabin Cui [Fri, 28 Apr 2017 20:43:08 +0000 (13:43 -0700)]
simpleperf: fix unknown binary in samples.
1. Wrong ip addresses in callchain can map to unknown binary. They
should be omitted.
2. When unknown binary is really hitted in samples, which is unlikely
to happen, make sure report-sample cmd will not skip the file id of
unknown binary.
3. Add corresponding test.
Bug: http://b/
37783312
Test: run simpleperf_unit_test.
Change-Id: Ifb5b59401bce9c8f81042015e73f190acd43ce31
Po Hu [Thu, 27 Apr 2017 11:23:15 +0000 (11:23 +0000)]
Merge "Fix wrong usage of * in find command" am:
b3502943dc am:
7323eeb32f am:
de7a4558c1
am:
7d2f245500
Change-Id: I52eccf1856870c844e2bbccf902bd2c3b8a20598
Po Hu [Thu, 27 Apr 2017 11:20:46 +0000 (11:20 +0000)]
Merge "Fix wrong usage of * in find command" am:
b3502943dc am:
7323eeb32f
am:
de7a4558c1
Change-Id: Ica6908ab76690c138f945363ee2c1978c268d327
Po Hu [Thu, 27 Apr 2017 11:18:14 +0000 (11:18 +0000)]
Merge "Fix wrong usage of * in find command" am:
b3502943dc
am:
7323eeb32f
Change-Id: I83e27ddc01e850cc3b5ac413cd820be28fed9864
Po Hu [Thu, 27 Apr 2017 11:15:46 +0000 (11:15 +0000)]
Merge "Fix wrong usage of * in find command"
am:
b3502943dc
Change-Id: I996a7288afbe58be416ed3f8cdb8c3b41727def1
Treehugger Robot [Thu, 27 Apr 2017 11:10:21 +0000 (11:10 +0000)]
Merge "Fix wrong usage of * in find command"
Po Hu [Tue, 25 Apr 2017 00:53:24 +0000 (08:53 +0800)]
Fix wrong usage of * in find command
When KATI_FIND_EMULATOR is disabled, the following warning message
will appear:
find: paths must precede expression: build_id.h
Usage: find [-H] [-L] [-P] [-Olevel]
[-D help|tree|search|stat|rates|opt|exec] [path...] [expression]
Because the * in 'find some/path -name *' command is wrongly
expanded by shell. We should change * to "*".
Change-Id: Ib051f47bb9335930944b8f63fd0fb54fbb867f31
Test: make KATI_EMULATE_FIND=false
Yabin Cui [Thu, 20 Apr 2017 22:18:24 +0000 (22:18 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
3929284." am:
e779206ade am:
05933b0f0d am:
33d4a83f97
am:
a1feb107c9
Change-Id: I3aed6bfef6d900da16e8ae79c0ed8f3744123203
Yabin Cui [Thu, 20 Apr 2017 22:15:24 +0000 (22:15 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
3929284." am:
e779206ade am:
05933b0f0d
am:
33d4a83f97
Change-Id: I8b88ffcd9dac924ebb393ca3905ecf55971fb713
Yabin Cui [Thu, 20 Apr 2017 22:12:21 +0000 (22:12 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
3929284." am:
e779206ade
am:
05933b0f0d
Change-Id: I724890074743b305ec8174d335dd8e6f64bfd471
Yabin Cui [Thu, 20 Apr 2017 22:09:21 +0000 (22:09 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
3929284."
am:
e779206ade
Change-Id: I6fa41e79a4244bbf0bcc6c08f99fe695fdd53465
Treehugger Robot [Thu, 20 Apr 2017 22:04:06 +0000 (22:04 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
3929284."
Yabin Cui [Thu, 20 Apr 2017 18:23:56 +0000 (11:23 -0700)]
simpleperf: update simpleperf prebuilts to build
3929284.
Taken from branch aosp-master.
Test: None.
Change-Id: I2da2d392cff6bcb6a65de203a73707fede5220de
Yabin Cui [Wed, 19 Apr 2017 22:39:42 +0000 (22:39 +0000)]
Merge "simpleperf: add --brief-callgraph option for report cmd." am:
e3d4de1a61 am:
77d41040fb am:
ef4a69aac8
am:
7c4b0e1635
Change-Id: I6c3578aee253b6162bd7fa4ccce560bdeea14ff4
Yabin Cui [Wed, 19 Apr 2017 22:07:10 +0000 (22:07 +0000)]
Merge "simpleperf: add --brief-callgraph option for report cmd." am:
e3d4de1a61 am:
77d41040fb
am:
ef4a69aac8
Change-Id: Ifd75bddcaeffa0006f68971d3e8c6354026582fe
Yabin Cui [Wed, 19 Apr 2017 22:04:36 +0000 (22:04 +0000)]
Merge "simpleperf: add --brief-callgraph option for report cmd." am:
e3d4de1a61
am:
77d41040fb
Change-Id: I46b356fdb6da1a438e08894c621ce034038faac9
Yabin Cui [Wed, 19 Apr 2017 22:03:06 +0000 (22:03 +0000)]
Merge "simpleperf: add --brief-callgraph option for report cmd."
am:
e3d4de1a61
Change-Id: I748fb4e0611d348f469088e7a8393e5aabfdf1ec
Treehugger Robot [Wed, 19 Apr 2017 21:57:21 +0000 (21:57 +0000)]
Merge "simpleperf: add --brief-callgraph option for report cmd."
Yabin Cui [Wed, 19 Apr 2017 18:48:44 +0000 (11:48 -0700)]
simpleperf: add --brief-callgraph option for report cmd.
Remove duplicated callgraphs (which appears as a sub graph in
another place) in --brief-callgraph mode.
Accept brief callgraph in report.py.
Add unit test for --brief-callgraph option.
Bug: http://b/
37444055
Test: run simpleperf_unit_test.
Test: manually run report.py.
Change-Id: I41977762552ec66807f394558352da6cbefaec2e
Yabin Cui [Wed, 19 Apr 2017 18:08:29 +0000 (18:08 +0000)]
Merge "simpleperf: add --start_profiling_fd option for record cmd." am:
faa89a17fd am:
ad46983ee8 am:
e0e4e2c085
am:
78743343eb
Change-Id: I43032d31b1ae56453bd8dcc9c73c9fac36dda92f
Yabin Cui [Wed, 19 Apr 2017 17:59:58 +0000 (17:59 +0000)]
Merge "simpleperf: add --start_profiling_fd option for record cmd." am:
faa89a17fd am:
ad46983ee8
am:
e0e4e2c085
Change-Id: I0f2f8d07c6fce17e52e744c2cc90edcfc5fb2e95
Yabin Cui [Wed, 19 Apr 2017 17:48:18 +0000 (17:48 +0000)]
Merge "simpleperf: add --start_profiling_fd option for record cmd." am:
faa89a17fd
am:
ad46983ee8
Change-Id: Ife0a346b79bb89be325d439476f0cd993e9994a3
Yabin Cui [Wed, 19 Apr 2017 17:46:49 +0000 (17:46 +0000)]
Merge "simpleperf: add --start_profiling_fd option for record cmd."
am:
faa89a17fd
Change-Id: I856f7a8a58b0332efa2d3dff6ff46cfd185cbca9
Treehugger Robot [Wed, 19 Apr 2017 17:41:40 +0000 (17:41 +0000)]
Merge "simpleperf: add --start_profiling_fd option for record cmd."
Yabin Cui [Tue, 18 Apr 2017 23:54:11 +0000 (16:54 -0700)]
simpleperf: add --start_profiling_fd option for record cmd.
Bug: http://b/
37480722
Test: run simpleperf_unit_test.
Change-Id: Ie6a742b986d79c70d3b6ab8e470eae42af34c9ef
Yabin Cui [Tue, 18 Apr 2017 22:59:13 +0000 (22:59 +0000)]
Merge "simpleperf: add warning for `--call-graph fp` option on arm." am:
05af0c8c65 am:
e6a0a81106 am:
13fe8a113f
am:
7cc4c3bf60
Change-Id: Ie997e425764ea8b883ffe6f5e3b1124a34b3517b
Yabin Cui [Tue, 18 Apr 2017 22:43:28 +0000 (22:43 +0000)]
Merge "simpleperf: add warning for `--call-graph fp` option on arm." am:
05af0c8c65 am:
e6a0a81106
am:
13fe8a113f
Change-Id: Ic12b48f48b00319f47c5b2439e305439fe0ffe5a
Yabin Cui [Tue, 18 Apr 2017 22:38:52 +0000 (22:38 +0000)]
Merge "simpleperf: add warning for `--call-graph fp` option on arm." am:
05af0c8c65
am:
e6a0a81106
Change-Id: Ic4ea049897257b78ffc389b8e79c4da8d978ad8c
Yabin Cui [Tue, 18 Apr 2017 22:33:52 +0000 (22:33 +0000)]
Merge "simpleperf: add warning for `--call-graph fp` option on arm."
am:
05af0c8c65
Change-Id: I542f29d75c69d57a40a9143afd3288167b57bc79
Treehugger Robot [Tue, 18 Apr 2017 22:27:34 +0000 (22:27 +0000)]
Merge "simpleperf: add warning for `--call-graph fp` option on arm."
Yabin Cui [Tue, 18 Apr 2017 19:41:46 +0000 (12:41 -0700)]
simpleperf: add warning for `--call-graph fp` option on arm.
Bug: http://b/
37443666
Test: run simpleperf_unit_test.
Change-Id: Ie376babab1aa5ec887c8d640266fbce9a0928290
Jin Qian [Mon, 17 Apr 2017 19:38:16 +0000 (19:38 +0000)]
ext4_utils: update default conf from e2fsprogs am:
cdc4f9bed9
am:
1090a6a1e2
Change-Id: I9776fb8ce17e7ee6dc5cafcb4297e01aa619f725
Jin Qian [Mon, 17 Apr 2017 19:10:59 +0000 (19:10 +0000)]
ext4_utils: update default conf from e2fsprogs
am:
cdc4f9bed9
Change-Id: Ia426461edd9301e60cf63d09ede5585bcbdf5486
Jin Qian [Sat, 15 Apr 2017 00:55:45 +0000 (17:55 -0700)]
ext4_utils: update default conf from e2fsprogs
Build server machines are using a conf file optimized for google
data center. We should use the default version from upstream
e2fsprogs.
Keep reserved_ratio at 1% to get more free space.
Bug:
37361511
Change-Id: I2638df72cfd3b9404981ef227651d38025a8053c
Yabin Cui [Fri, 14 Apr 2017 18:51:26 +0000 (18:51 +0000)]
Merge "perfprofd: Use testdata in Android.bp." am:
30257fab6d am:
9f559bc6c7 am:
b91608dead
am:
a4180d8e26
Change-Id: I6f359f2de3e309182fad4be999c858042a49964d
Yabin Cui [Fri, 14 Apr 2017 16:20:22 +0000 (16:20 +0000)]
Merge "perfprofd: Use testdata in Android.bp." am:
30257fab6d am:
9f559bc6c7
am:
b91608dead
Change-Id: I5a4126514616eafaf5f1d5431b6d3eb28ffb34a3
Yabin Cui [Fri, 14 Apr 2017 16:13:48 +0000 (16:13 +0000)]
Merge "perfprofd: Use testdata in Android.bp." am:
30257fab6d
am:
9f559bc6c7
Change-Id: If7b5882deac65c90eb0e4a53ea15ccd3b6045321
Yabin Cui [Fri, 14 Apr 2017 16:07:19 +0000 (16:07 +0000)]
Merge "perfprofd: Use testdata in Android.bp."
am:
30257fab6d
Change-Id: Ia53aa7e61ddc727e745af42243277c425d881b38
Treehugger Robot [Fri, 14 Apr 2017 15:58:31 +0000 (15:58 +0000)]
Merge "perfprofd: Use testdata in Android.bp."
Yabin Cui [Thu, 13 Apr 2017 23:26:00 +0000 (23:26 +0000)]
Merge "simpleperf: fix pprof proto generator." am:
d2b7f6afe5 am:
d4f4c4518e am:
9db43ebe0e
am:
925b66e787
Change-Id: I0c8e25d9ca388d1d09bd3567a1a06dd96b482569
Yabin Cui [Thu, 13 Apr 2017 22:45:13 +0000 (22:45 +0000)]
Merge "simpleperf: fix pprof proto generator." am:
d2b7f6afe5 am:
d4f4c4518e
am:
9db43ebe0e
Change-Id: I10fa5f40ccbdee997aa43b318c49e7c3c0e19f55
Yabin Cui [Thu, 13 Apr 2017 22:39:05 +0000 (22:39 +0000)]
Merge "simpleperf: fix pprof proto generator." am:
d2b7f6afe5
am:
d4f4c4518e
Change-Id: I354bfdb2977382d2bd98898cf079d777f55198e7
Yabin Cui [Thu, 13 Apr 2017 22:33:04 +0000 (22:33 +0000)]
Merge "simpleperf: fix pprof proto generator."
am:
d2b7f6afe5
Change-Id: Ife8a2d885ed454537b8ebde08516351ac41156a6
Yabin Cui [Thu, 13 Apr 2017 22:19:15 +0000 (22:19 +0000)]
Merge "simpleperf: fix pprof proto generator."
Yabin Cui [Thu, 13 Apr 2017 19:13:02 +0000 (12:13 -0700)]
perfprofd: Use testdata in Android.bp.
Bug: http://b/
33846452
Test: run perfprofd_tests.
Change-Id: I90b3808f0a45b8158acd0ab8ebe53c3df9531b5f
Yabin Cui [Thu, 13 Apr 2017 20:44:15 +0000 (13:44 -0700)]
simpleperf: fix pprof proto generator.
Bug: http://b/
36988814
Test: run pprof_proto_generator.py and no function_id == 0.
Change-Id: I42bead12818e2d9396c4e52afc2dca84558d7731
Mohan Srinivasan [Wed, 5 Apr 2017 04:31:45 +0000 (04:31 +0000)]
Merge changes I127a22ae,I8b469b41 am:
248a0baefe am:
306393bd52 am:
956463031a
am:
e066676c19
Change-Id: I2efcb98585e25983313f55f3900ffbf0e58ec7c2
Mohan Srinivasan [Wed, 5 Apr 2017 04:29:17 +0000 (04:29 +0000)]
Merge changes I127a22ae,I8b469b41 am:
248a0baefe am:
306393bd52
am:
956463031a
Change-Id: I95edd08fcdbc2e3cf905fce6607081c935084872
Mohan Srinivasan [Wed, 5 Apr 2017 04:27:17 +0000 (04:27 +0000)]
Merge changes I127a22ae,I8b469b41 am:
248a0baefe
am:
306393bd52
Change-Id: Id4ae588ba4d5e2201fc7af6e949e76195915fc15
Mohan Srinivasan [Wed, 5 Apr 2017 04:25:22 +0000 (04:25 +0000)]
Merge changes I127a22ae,I8b469b41
am:
248a0baefe
Change-Id: Ie659ff8a16ba113369ff7635159868e78ce44d35
Treehugger Robot [Wed, 5 Apr 2017 04:20:44 +0000 (04:20 +0000)]
Merge changes I127a22ae,I8b469b41
* changes:
Use TotalTime instead of ThisTime as app launch latency metric
app-launcher is a App Launch Perf Analysis tool.
Mohan Srinivasan [Wed, 1 Feb 2017 00:06:32 +0000 (16:06 -0800)]
Use TotalTime instead of ThisTime as app launch latency metric
Use TotalTime instead of ThisTime (both reported by am) as our
activity launch latency metric. TotalTime is more representative
of user perceived latency. Also add back YouTube to the list of
apps we launch test by default.
Test: Time app launches manually for the various apps, and check
that TotalTime better represents the launch latency.
Change-Id: I127a22ae409ee0141d847e711e09f7873dbb420f
Signed-off-by: Mohan Srinivasan <srmohan@google.com>
Mohan Srinivasan [Thu, 26 Jan 2017 19:07:14 +0000 (11:07 -0800)]
app-launcher is a App Launch Perf Analysis tool.
app-launcher is an automated tool that automates the launching of
selected Apps (hundreds of times each) and collects system metrics
like CPU util, storage device util, launch times, context switches,
branch mispredicts etc. This is very useful for A/B compares of system
changes in how they impact App Launch. This code was under
google_experimental and was used by various members who found it very
useful, so moving it under system/extras (under userdebug).
Test: I (and others) have used app launcher on multiple occasions over
several months. And comparison of metrics reported by app-launcher are
consistent with metrics reported by other tools, for these tests.
Change-Id: I8b469b4165035a958b155cfffc93341cddcc444c
Signed-off-by: Mohan Srinivasan <srmohan@google.com>
Dan Shi [Wed, 5 Apr 2017 00:34:10 +0000 (00:34 +0000)]
Merge "Add test config to memory_replay_tests" am:
a88b7b14ec am:
621cc04f04 am:
a16fa61ec8
am:
895ae99335
Change-Id: Icfb635818b1a9e908f9109af62631940c75369ae
Eric Biggers [Wed, 5 Apr 2017 00:33:49 +0000 (00:33 +0000)]
ext4_utils: define keyctl_unlink() am:
512904129a
am:
2edbb8c96d
Change-Id: I4a567e59fe04eac13a167c8d584b9365062ac740
Dan Shi [Wed, 5 Apr 2017 00:33:27 +0000 (00:33 +0000)]
Merge "Add test config to memory_replay_tests" am:
a88b7b14ec am:
621cc04f04
am:
a16fa61ec8
Change-Id: Ic455b7621122709e009b62c258513b666c5d947f
Eric Biggers [Wed, 5 Apr 2017 00:31:48 +0000 (00:31 +0000)]
ext4_utils: define keyctl_unlink()
am:
512904129a
Change-Id: I796c67f4ba14f13a99408ad9f54e9a9151ed986f
Dan Shi [Wed, 5 Apr 2017 00:24:38 +0000 (00:24 +0000)]
Merge "Add test config to memory_replay_tests" am:
a88b7b14ec
am:
621cc04f04
Change-Id: I741f766efdd480a18082f073aea30c8c681f0494
Dan Shi [Wed, 5 Apr 2017 00:22:38 +0000 (00:22 +0000)]
Merge "Add test config to memory_replay_tests"
am:
a88b7b14ec
Change-Id: If4ea7e3f04dd88552c4023fee018ce1b96f03300
Treehugger Robot [Wed, 5 Apr 2017 00:16:56 +0000 (00:16 +0000)]
Merge "Add test config to memory_replay_tests"
Eric Biggers [Mon, 3 Apr 2017 22:46:31 +0000 (15:46 -0700)]
ext4_utils: define keyctl_unlink()
This will allow vold to unlink keys rather than revoking them.
This also removes the keyctl_revoke() definition for now, to discourage
any further (mis)use in the context of ext4 encryption.
Bug:
35988361
Change-Id: Ic94329040f77ffbe2415287fe1202fa61e8a006b
(cherry picked from commit
3f062383deb3e5ba7b16d4728f5dbc44f40bc178)
Eric Biggers [Tue, 4 Apr 2017 22:16:50 +0000 (22:16 +0000)]
Merge "ext4_utils: define keyctl_unlink()"
Jin Qian [Tue, 4 Apr 2017 22:08:07 +0000 (22:08 +0000)]
Merge "ext4_utils: add default mke2fs.conf" into oc-dev am:
1cf3416564
am:
ffb5dd7abc
Change-Id: I7e3014eef33ce62ee905ed8b2b1cc905e0963c59
Jin Qian [Tue, 4 Apr 2017 21:58:04 +0000 (21:58 +0000)]
Merge "ext4_utils: add default mke2fs.conf" into oc-dev
am:
1cf3416564
Change-Id: I9bf06099b929b00a3255724affdfacba7307c59b
Jin Qian [Tue, 4 Apr 2017 21:54:28 +0000 (21:54 +0000)]
Merge "ext4_utils: add default mke2fs.conf" into oc-dev
Dan Cashman [Tue, 4 Apr 2017 21:49:44 +0000 (21:49 +0000)]
Fix cts alsr failure. am:
f92a38e36b
am:
c8f8354ba2
Change-Id: I222bc9be86b752c8731ace65c5073c2291074709
Dan Cashman [Tue, 4 Apr 2017 21:40:37 +0000 (21:40 +0000)]
Fix cts alsr failure.
am:
f92a38e36b
Change-Id: Ifc5148825fdd368c323975fad90f95175ebe491b
Jin Qian [Fri, 10 Mar 2017 20:14:54 +0000 (12:14 -0800)]
ext4_utils: add default mke2fs.conf
Copy default configs from borg build machine and enable ext_attr.
Bug:
34947454
Test: make systemimage
Change-Id: I011b3d119f35beb0e78b804e62deff229775a0b0
(cherry picked from commit
87eb12642f68f5a8594893618cfab128da82ebd8)
Dan Cashman [Tue, 4 Apr 2017 17:44:05 +0000 (10:44 -0700)]
Fix cts alsr failure.
/data/nativetest is not present on user builds, so remove tests
depending on that from CTS inclusion.
Bug:
36888825
Bug:
36484285
Test: cts builds and runs (test no longer present)
Change-Id: I7134a1dca6df03fdfa9c0cc7488abd4570a95e33
Dan Shi [Tue, 4 Apr 2017 17:23:43 +0000 (10:23 -0700)]
Add test config to memory_replay_tests
This change allows TradeFederation to run the test directly.
Refer to b/
35882476 for design and discussion of this change.
Bug:
35882476
Test: local test
tradefed.sh run template/local --template:map test=memory_replay_tests
Change-Id: Ibce3758f999e3f85624e5c6ca48f21f6e496b356
TreeHugger Robot [Tue, 4 Apr 2017 02:24:45 +0000 (02:24 +0000)]
Merge "ext4_utils: add default mke2fs.conf"
Dan Shi [Tue, 4 Apr 2017 02:02:38 +0000 (02:02 +0000)]
Merge "Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host test cases" am:
f0deb9a4dd am:
c99398e65d am:
5aa626a936
am:
8abcae0577
Change-Id: I7d736e7059ce649bb45f88be6ce565fc76c5f9e4
Dan Shi [Tue, 4 Apr 2017 01:44:50 +0000 (01:44 +0000)]
Merge "Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host test cases" am:
f0deb9a4dd am:
c99398e65d
am:
5aa626a936
Change-Id: Ibe459b552845ae784e1b72e45a5805c556d49eed
Dan Shi [Tue, 4 Apr 2017 01:37:03 +0000 (01:37 +0000)]
Merge "Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host test cases" am:
f0deb9a4dd
am:
c99398e65d
Change-Id: I6f91eeb0640c734ac3679d6095a63c1eb1c11642
Dan Shi [Tue, 4 Apr 2017 01:30:57 +0000 (01:30 +0000)]
Merge "Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host test cases"
am:
f0deb9a4dd
Change-Id: I3f5a34c752e4094f27145deae243d93f210d30d3
Treehugger Robot [Tue, 4 Apr 2017 01:26:55 +0000 (01:26 +0000)]
Merge "Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host test cases"
Dan Shi [Mon, 3 Apr 2017 23:46:27 +0000 (16:46 -0700)]
Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host test cases
These two tests may not support host side test yet, don't output the test binary
to testcases folder for now.
Test: make -j simpleperf_unit_test
Bug:
36820939
Change-Id: Ibffdf6a842e1cfabe8aa38dd75a79416a8bd0b23
Eric Biggers [Mon, 3 Apr 2017 22:46:31 +0000 (15:46 -0700)]
ext4_utils: define keyctl_unlink()
This will allow vold to unlink keys rather than revoking them.
This also removes the keyctl_revoke() definition for now, to discourage
any further (mis)use in the context of ext4 encryption.
Change-Id: Ic94329040f77ffbe2415287fe1202fa61e8a006b
Tom Cherry [Mon, 3 Apr 2017 22:12:44 +0000 (22:12 +0000)]
Merge "Removed e4crypt_create_device_key" into oc-dev am:
2fbc9b893f
am:
cf9ee55f29
Change-Id: Id46907d84d0224a43192396b07629b278862315f
Tom Cherry [Mon, 3 Apr 2017 22:06:02 +0000 (22:06 +0000)]
Merge "Removed e4crypt_create_device_key" into oc-dev
am:
2fbc9b893f
Change-Id: I52922052fc3d1d618f9332bd46b583f7e288112b
Tom Cherry [Mon, 3 Apr 2017 21:58:44 +0000 (21:58 +0000)]
Merge "Removed e4crypt_create_device_key" into oc-dev
Jin Qian [Fri, 10 Mar 2017 20:14:54 +0000 (12:14 -0800)]
ext4_utils: add default mke2fs.conf
Copy default configs from borg build machine and enable ext_attr.
Bug:
34947454
Test: make systemimage
Change-Id: I011b3d119f35beb0e78b804e62deff229775a0b0
Dan Shi [Fri, 31 Mar 2017 17:24:30 +0000 (17:24 +0000)]
Merge "Add test config to simpleperf_unit_test and simpleperf_unit_test" am:
4f6fd05205 am:
c76a993f79 am:
bf837ea212
am:
44d8d8876a
Change-Id: I9b71583490cbde95669fce55ed47bad37579f898