OSDN Git Service
Yabin Cui [Tue, 18 Jul 2017 02:55:33 +0000 (02:55 +0000)]
Merge "simpleperf: add test for dumping regs for tracepoint events." am:
87fcb8c6c1 am:
eb21435bf2 am:
c212c554b4
am:
88d977f12a
Change-Id: I295c1ac66cd386673ccaccaa64a15117115b274e
Yabin Cui [Tue, 18 Jul 2017 02:53:04 +0000 (02:53 +0000)]
Merge "simpleperf: add test for dumping regs for tracepoint events." am:
87fcb8c6c1 am:
eb21435bf2
am:
c212c554b4
Change-Id: Iaad72fbf83387bc933e93e50c9ae826b6819759c
Yabin Cui [Tue, 18 Jul 2017 02:50:34 +0000 (02:50 +0000)]
Merge "simpleperf: add test for dumping regs for tracepoint events." am:
87fcb8c6c1
am:
eb21435bf2
Change-Id: Ib0e0fa4ff6b5e8451ca69fa6b27aed14229222ab
Yabin Cui [Tue, 18 Jul 2017 02:48:06 +0000 (02:48 +0000)]
Merge "simpleperf: add test for dumping regs for tracepoint events."
am:
87fcb8c6c1
Change-Id: If27da0ebd6cc1a25bb0f44b9ce8b80ed1ff5c60f
Treehugger Robot [Tue, 18 Jul 2017 02:44:41 +0000 (02:44 +0000)]
Merge "simpleperf: add test for dumping regs for tracepoint events."
Yabin Cui [Mon, 17 Jul 2017 21:36:37 +0000 (14:36 -0700)]
simpleperf: add test for dumping regs for tracepoint events.
If the test fails, probably a kernel patch is missing:
5b09a094f2 arm64: perf: Fix callchain parse error with kernel tracepoint events
To support the test, also enable recording tracepoint events in
app's context.
Bug: http://b/
29520177
Test: run CtsSimpleperfTestCases64 on devices.
Change-Id: I085114113732366305e92f6a1e6c3b6efc6ff5ff
Fabien Sanglard [Mon, 17 Jul 2017 18:50:32 +0000 (18:50 +0000)]
Merge "Add event monitoring to Inferno." am:
945911cbae am:
878c04ed7d am:
d9a9139b54
am:
7d8ac8767e
Change-Id: Ic3c8b7d97d43d677f921201fd65be849cc7fb5b5
Fabien Sanglard [Mon, 17 Jul 2017 18:48:02 +0000 (18:48 +0000)]
Merge "Add event monitoring to Inferno." am:
945911cbae am:
878c04ed7d
am:
d9a9139b54
Change-Id: I7667a49e426cd64070a5d9685453025888671fcc
Fabien Sanglard [Mon, 17 Jul 2017 18:45:32 +0000 (18:45 +0000)]
Merge "Add event monitoring to Inferno." am:
945911cbae
am:
878c04ed7d
Change-Id: I382e276fbd8c045732c7c4cdde0ff478993484e8
Fabien Sanglard [Mon, 17 Jul 2017 18:43:03 +0000 (18:43 +0000)]
Merge "Add event monitoring to Inferno."
am:
945911cbae
Change-Id: I93d6d92ef1fab873c9144d70b271b61c26694930
Treehugger Robot [Mon, 17 Jul 2017 18:35:22 +0000 (18:35 +0000)]
Merge "Add event monitoring to Inferno."
Yabin Cui [Mon, 17 Jul 2017 18:27:29 +0000 (18:27 +0000)]
Merge "simpleperf: replace config file with cmdline options." am:
e5ad887a62 am:
271a040687 am:
ac882615b5
am:
1688f39397
Change-Id: I5c923e680e63db67e022a7ae447ba66fed9b6f63
Yabin Cui [Mon, 17 Jul 2017 18:25:32 +0000 (18:25 +0000)]
Merge "simpleperf: replace config file with cmdline options." am:
e5ad887a62 am:
271a040687
am:
ac882615b5
Change-Id: Ic24aecaf202de6e2854b253eb4c43285c2708a13
Yabin Cui [Mon, 17 Jul 2017 18:23:29 +0000 (18:23 +0000)]
Merge "simpleperf: replace config file with cmdline options." am:
e5ad887a62
am:
271a040687
Change-Id: Ieb735fa3f8ecbcc8a037e114faecd94ad73e6748
Yabin Cui [Mon, 17 Jul 2017 18:21:31 +0000 (18:21 +0000)]
Merge "simpleperf: replace config file with cmdline options."
am:
e5ad887a62
Change-Id: I71c585b603dff3c762512f7b88209ed8d2bbedbe
Yabin Cui [Mon, 17 Jul 2017 18:13:28 +0000 (18:13 +0000)]
Merge "simpleperf: replace config file with cmdline options."
Yabin Cui [Sat, 15 Jul 2017 05:38:56 +0000 (05:38 +0000)]
Merge "simpleperf: change the way running cts tests." am:
9bc17045b0 am:
36caf047e2 am:
788898254e
am:
64ca96d48a
Change-Id: Ib611616632d303f044a1aaba685185dca9e1d846
Yabin Cui [Sat, 15 Jul 2017 05:34:25 +0000 (05:34 +0000)]
Merge "simpleperf: change the way running cts tests." am:
9bc17045b0 am:
36caf047e2
am:
788898254e
Change-Id: I71b7aba0868f1150c250d6b484844ea54f5d828f
Yabin Cui [Sat, 15 Jul 2017 05:29:25 +0000 (05:29 +0000)]
Merge "simpleperf: change the way running cts tests." am:
9bc17045b0
am:
36caf047e2
Change-Id: I3ffbac68c35a641a263eb9047d14c96cb36ee196
Yabin Cui [Sat, 15 Jul 2017 05:24:27 +0000 (05:24 +0000)]
Merge "simpleperf: change the way running cts tests."
am:
9bc17045b0
Change-Id: Ib026e6cf03cbde6a943ac14a1f085ddea83207cd
Treehugger Robot [Sat, 15 Jul 2017 05:18:31 +0000 (05:18 +0000)]
Merge "simpleperf: change the way running cts tests."
Yabin Cui [Fri, 14 Jul 2017 22:59:56 +0000 (15:59 -0700)]
simpleperf: change the way running cts tests.
Before this CL, CtsSimpleperfTestCases copies itself to the app's
directory, then run it using run-as.
With this CL, CtsSimpleperfTestCases keeps itself in /data/local/tmp,
but forces stat/record cmd to run with --app option. This gives
more freedom to tests:
1. They can stay in shell's context with --in-app option.
2. The stat/record cmds are started in the shell's context, so
they can collect information no available in app's context (like
data in /sys/kernel/debug/tracing/events).
This is a preparation to add tests for recording tracepoint events.
It also matches the way we want users to use simpleperf (with --app option).
Bug: http://b/
29520177
Test: run CtsSimpleperfTestCases.
Change-Id: I1709adfb1ff7169df87560226c197e473fdf8516
Yabin Cui [Thu, 13 Jul 2017 21:49:42 +0000 (14:49 -0700)]
simpleperf: replace config file with cmdline options.
1. For binary_cache_builder.py, annoate.py and pprof_proto_generator.py,
there are only a few options, use a config file seems overkill, so
replace them with cmdline options.
2. Add cmdline interface for app_profiler.py. It is to simplify usage,
and can be called from tests (will be added).
3. Simplify the way to find tools (including adb,readelf,addr2line),
try to find them in default install location of sdk and ndk. And output
error/warning msg if not found.
4. Raise exception in python are not always helpful for users to find
problems, because the error msg is hidden by exception stack dump. So
replace some log_fatal() with log_exit().
5. Change README.md accordingly.
Bug: http://b/
32834638
Test: run scripts manually.
Change-Id: Ic60e496edbe748b801d35144da29f40c3db3e250
Yabin Cui [Fri, 14 Jul 2017 23:54:56 +0000 (23:54 +0000)]
Merge "simpleperf: support "--app" option in record/stat command." am:
9aa1dc2f30 am:
44139af1f4 am:
422cf022c7
am:
1d2e80145c
Change-Id: Ifff7f53bc093299984de59cf1ccc79f3d9278db3
Yabin Cui [Fri, 14 Jul 2017 23:51:19 +0000 (23:51 +0000)]
Merge "simpleperf: support "--app" option in record/stat command." am:
9aa1dc2f30 am:
44139af1f4
am:
422cf022c7
Change-Id: I14b37ee17f58af8e9f4612b2f6ae3c03f6c5da8b
Yabin Cui [Fri, 14 Jul 2017 23:42:35 +0000 (23:42 +0000)]
Merge "simpleperf: support "--app" option in record/stat command." am:
9aa1dc2f30
am:
44139af1f4
Change-Id: I4f152fe72dc5ffea7995dddd85f115d21f72acb1
Yabin Cui [Fri, 14 Jul 2017 23:38:33 +0000 (23:38 +0000)]
Merge "simpleperf: support "--app" option in record/stat command."
am:
9aa1dc2f30
Change-Id: I4ca9cac0a3400f59d8e66fdeb1b68af2a62e7f98
Treehugger Robot [Fri, 14 Jul 2017 23:32:35 +0000 (23:32 +0000)]
Merge "simpleperf: support "--app" option in record/stat command."
Tom Cherry [Fri, 14 Jul 2017 23:22:45 +0000 (23:22 +0000)]
Merge changes from topic 'ext4_encryption_flag' am:
7ce805c97e am:
4e02dcd7d0 am:
6af1b87cbc
am:
dd57ee8632
Change-Id: I27486ce41355cfa387d29ebb3f8a1f531d8101fd
Eric Biggers [Fri, 14 Jul 2017 23:22:40 +0000 (23:22 +0000)]
ext4.h: add EXT4_FEATURE_INCOMPAT_ENCRYPT am:
1468fbabdd am:
de07b52713 am:
1965c510e4
am:
9522550f29
Change-Id: I32b97cad44c623f0fc9b8a73e04f3eb198a4058b
Tom Cherry [Fri, 14 Jul 2017 23:18:08 +0000 (23:18 +0000)]
Merge changes from topic 'ext4_encryption_flag' am:
7ce805c97e am:
4e02dcd7d0
am:
6af1b87cbc
Change-Id: I4eaa7306a01fc156ee133f379c609d95a96bb3a3
Eric Biggers [Fri, 14 Jul 2017 23:18:05 +0000 (23:18 +0000)]
ext4.h: add EXT4_FEATURE_INCOMPAT_ENCRYPT am:
1468fbabdd am:
de07b52713
am:
1965c510e4
Change-Id: Ie865e9b5b0ee0bdb71e947845d105e7edd0e927d
Tom Cherry [Fri, 14 Jul 2017 23:14:15 +0000 (23:14 +0000)]
Merge changes from topic 'ext4_encryption_flag' am:
7ce805c97e
am:
4e02dcd7d0
Change-Id: I562edcdf7fb0c8b84edfaf400702ce17d528c817
Eric Biggers [Fri, 14 Jul 2017 23:14:11 +0000 (23:14 +0000)]
ext4.h: add EXT4_FEATURE_INCOMPAT_ENCRYPT am:
1468fbabdd
am:
de07b52713
Change-Id: I963381be3204e283381d41a79f608561f7195d44
Tom Cherry [Fri, 14 Jul 2017 23:12:05 +0000 (23:12 +0000)]
Merge changes from topic 'ext4_encryption_flag'
am:
7ce805c97e
Change-Id: I11917818efdc536b35832116b4bafc7ecbaa29c7
Eric Biggers [Fri, 14 Jul 2017 23:11:55 +0000 (23:11 +0000)]
ext4.h: add EXT4_FEATURE_INCOMPAT_ENCRYPT
am:
1468fbabdd
Change-Id: I898cae635e00f2a01893b3d23b7c77f14fff684e
Tom Cherry [Fri, 14 Jul 2017 23:06:30 +0000 (23:06 +0000)]
Merge changes from topic 'ext4_encryption_flag'
* changes:
ext4_sb.h: make feature flags in fs_info 32-bit
ext4.h: add EXT4_FEATURE_INCOMPAT_ENCRYPT
Yabin Cui [Wed, 12 Jul 2017 22:50:20 +0000 (15:50 -0700)]
simpleperf: support "--app" option in record/stat command.
By using --app [package_name] option, users don't need to
manually run run-as or look for the app's process.
It is also good for profiling app startup time.
For simpleperf, it now can start in the shell's context,
and be able to get tracing events information, which can
support profiling tracepoint events for apps. This is
useful for monitoring thread sleep time.
This CL is tested manually, but I will change the
way of running simpleperf cts test to test this.
Bug: http://b/
34108866
Test: test manually.
Change-Id: I8db0390af8e49c56dc4860374153f753bbcf9b11
Mohan Srinivasan [Thu, 13 Jul 2017 20:43:45 +0000 (20:43 +0000)]
Merge "Add support for Go."
Fabien Sanglard [Thu, 13 Jul 2017 17:56:24 +0000 (10:56 -0700)]
Add event monitoring to Inferno.
Change-Id: Ifd695d3b13b0da74c1e87e05c89ceee1101fa22a
Mohan Srinivasan [Wed, 12 Jul 2017 22:13:50 +0000 (15:13 -0700)]
Add support for Go.
Add support for Go devices.
Test: Start app-launcher on Go and verify that the data reported looks
sane.
Change-Id: I1bc0bd23e7d807444f0ac35d7c18c8206bb7c12e
Signed-off-by: Mohan Srinivasan <srmohan@google.com>
Mohan Srinivasan [Thu, 13 Jul 2017 17:58:21 +0000 (17:58 +0000)]
Merge "Add an option to explicitly specify blockdev."
Fabien Sanglard [Thu, 13 Jul 2017 16:57:03 +0000 (16:57 +0000)]
Merge "Inferno: A framegrapher based on simpleperf" am:
af30023228 am:
d8f0a1eb93 am:
f72ee84ba0
am:
f48607ac87
Change-Id: I19d9b0a810ce8dea5142af158924a9c33a660544
Fabien Sanglard [Thu, 13 Jul 2017 16:54:35 +0000 (16:54 +0000)]
Merge "Inferno: A framegrapher based on simpleperf" am:
af30023228 am:
d8f0a1eb93
am:
f72ee84ba0
Change-Id: I7f3c76af95c049425985b6dd89d00c75dfe24c80
Fabien Sanglard [Thu, 13 Jul 2017 16:52:33 +0000 (16:52 +0000)]
Merge "Inferno: A framegrapher based on simpleperf" am:
af30023228
am:
d8f0a1eb93
Change-Id: I595ef7ed445cd973d413ac8f712d4ff8b67fff14
Fabien Sanglard [Thu, 13 Jul 2017 16:49:33 +0000 (16:49 +0000)]
Merge "Inferno: A framegrapher based on simpleperf"
am:
af30023228
Change-Id: I9b8ca44ac7ffa79870fa40c7c52bfd60d1259413
Fabien Sanglard [Thu, 13 Jul 2017 16:46:21 +0000 (16:46 +0000)]
Merge "Inferno: A framegrapher based on simpleperf"
Sen Jiang [Thu, 13 Jul 2017 05:57:25 +0000 (05:57 +0000)]
Merge "os-release.d: set the default version to four numbers." am:
80e0678406 am:
65f9088af1 am:
2653fea4c7
am:
684962ce49
Change-Id: Ie3b95683a63dcae706a2d7f2b2d208b764b58014
Sen Jiang [Thu, 13 Jul 2017 05:54:54 +0000 (05:54 +0000)]
Merge "os-release.d: set the default version to four numbers." am:
80e0678406 am:
65f9088af1
am:
2653fea4c7
Change-Id: I9c30b760626671f38a604149834da2cc8e547b80
Sen Jiang [Thu, 13 Jul 2017 05:52:53 +0000 (05:52 +0000)]
Merge "os-release.d: set the default version to four numbers." am:
80e0678406
am:
65f9088af1
Change-Id: I44152b354f0b872ef5b0c54bf4ac13496742cfbc
Sen Jiang [Thu, 13 Jul 2017 05:50:57 +0000 (05:50 +0000)]
Merge "os-release.d: set the default version to four numbers."
am:
80e0678406
Change-Id: Id75fbf587b59623b8c4ced6f108f880724362210
Treehugger Robot [Thu, 13 Jul 2017 05:46:38 +0000 (05:46 +0000)]
Merge "os-release.d: set the default version to four numbers."
Yabin Cui [Thu, 13 Jul 2017 01:40:09 +0000 (01:40 +0000)]
Merge "simpleperf: add test for recording cpu-clock." am:
9dc8dd6de2 am:
4f5d2f4357 am:
3e74919c11
am:
fa47378af7
Change-Id: Ife392b80f83f15cce6cecfcbf94e60bad25dde63
Yabin Cui [Thu, 13 Jul 2017 01:37:41 +0000 (01:37 +0000)]
Merge "simpleperf: add test for recording cpu-clock." am:
9dc8dd6de2 am:
4f5d2f4357
am:
3e74919c11
Change-Id: Id3c2a2d54fbf9f8181dc6777846d64ea9edea8fd
Yabin Cui [Thu, 13 Jul 2017 01:35:10 +0000 (01:35 +0000)]
Merge "simpleperf: add test for recording cpu-clock." am:
9dc8dd6de2
am:
4f5d2f4357
Change-Id: Ifffef0768bfce6ae932f23d40c6d2c2bdb58d6c6
Yabin Cui [Thu, 13 Jul 2017 01:33:11 +0000 (01:33 +0000)]
Merge "simpleperf: add test for recording cpu-clock."
am:
9dc8dd6de2
Change-Id: I94a66720ceeeb0b95eca5eadb8fd529f5744d931
Treehugger Robot [Thu, 13 Jul 2017 01:30:30 +0000 (01:30 +0000)]
Merge "simpleperf: add test for recording cpu-clock."
Sen Jiang [Tue, 4 Apr 2017 20:24:56 +0000 (13:24 -0700)]
os-release.d: set the default version to four numbers.
We will report system_version and product_version separately to Omaha,
so revert back to using four numbers for version.
Test: cat $OUT/system/etc/os-release.d/system_version
Change-Id: Ife69a7a17d1a06cc9127540cb39f27ce4fd0c944
(cherry picked from commit
d454042d764713ead2b87b78f4d2292d2d422d45)
Yabin Cui [Thu, 13 Jul 2017 00:51:08 +0000 (00:51 +0000)]
Merge "simpleperf: enforce support of dwarf based callgraph." am:
1564048fd3 am:
63d9e48597 am:
aedec0dc79
am:
c4eb610186
Change-Id: Ic4b01a66be4dfa3b2a2f35a74c5afa1ac313b194
Yabin Cui [Thu, 13 Jul 2017 00:49:05 +0000 (00:49 +0000)]
Merge "simpleperf: enforce support of dwarf based callgraph." am:
1564048fd3 am:
63d9e48597
am:
aedec0dc79
Change-Id: I24c3bf2e65bcfaed42f41a73ad7fef075783594b
Fabien Sanglard [Wed, 28 Jun 2017 20:18:52 +0000 (13:18 -0700)]
Inferno: A framegrapher based on simpleperf
Inferno generates flamegraph for an entire process in one click.
The HTML report is automatically opened in the machine browser.
To run it on surfaceflinger, start UIBench to generate load and:
- ./inferno.sh (Linux/MacOS)
- ./inferno.bat (Windows)
See report.html for a sample report.
Change-Id: I35a20fcfe4b385dbf45832bef0ff69b80a44e1d6
Yabin Cui [Thu, 13 Jul 2017 00:46:37 +0000 (00:46 +0000)]
Merge "simpleperf: enforce support of dwarf based callgraph." am:
1564048fd3
am:
63d9e48597
Change-Id: I281bc4465071c642bad981196ab993c5b61bbf4c
Yabin Cui [Thu, 13 Jul 2017 00:44:42 +0000 (00:44 +0000)]
Merge "simpleperf: enforce support of dwarf based callgraph."
am:
1564048fd3
Change-Id: I8fea0476d4e95ba9fa807760f2cf7e61b82a4c40
Yabin Cui [Thu, 13 Jul 2017 00:42:36 +0000 (00:42 +0000)]
Merge "simpleperf: enforce support of dwarf based callgraph."
Yabin Cui [Wed, 12 Jul 2017 21:50:07 +0000 (14:50 -0700)]
simpleperf: enforce support of dwarf based callgraph.
If it is not supported by the kernel, it may be because
a kernel patch "perf: Fix arch_perf_out_copy_user default",
or a configuration HAVE_PERF_USER_STACK_DUMP is missing.
Bug: http://b/
63634097
Test: run simpleperf_unit_tests.
Change-Id: I4d3b2de72925c3566bcb0ebe41872919b7312687
Yabin Cui [Wed, 12 Jul 2017 21:25:46 +0000 (14:25 -0700)]
simpleperf: add test for recording cpu-clock.
Bug: http://b/
63135835
Test: run the test on marlin.
Change-Id: I5b51eaafb596dc7df886b59b5ea208ae9c2c739a
Mohan Srinivasan [Wed, 12 Jul 2017 21:03:16 +0000 (14:03 -0700)]
Add an option to explicitly specify blockdev.
Add a -b option, that allows user to explicitly specify a blockdev
that we want to get stats out of. For example, this allows us to
specify the userdata partition (on which IOshark runs). Or in the rare
case where support for a new device has not been added yet, we can
still run IOshark on it by using this option.
Test: Run IOshark with the -b option passed in and verify that the
device stats reported match with /proc/diskstats.
Change-Id: Ic835697a6aae4484c95537e7d489a9c1fefc0110
Signed-off-by: Mohan Srinivasan <srmohan@google.com>
Mohan Srinivasan [Mon, 10 Jul 2017 18:54:19 +0000 (11:54 -0700)]
Adding ioblame. A tool for App IO profiling.
ioblame is a tool for profiling App IO workloads. See the README for
more details on ioblame and how to use it.
Change-Id: Id56f827c2a8b744e24e3b21b535a59bd458f3de4
Signed-off-by: Mohan Srinivasan <srmohan@google.com>
nickrose [Mon, 10 Jul 2017 19:08:07 +0000 (12:08 -0700)]
Add kernel.config tests to VTS
Follow-up on Change-Id: Id52ac1639447276171006c33bdfa7b4e6c874745
b/
62423436.
Test: make vts
Change-Id: I16269c4b6ce9ea4b01a07f9e30771a97025f3bac
Maggie White [Fri, 7 Jul 2017 18:45:26 +0000 (18:45 +0000)]
Merge "Additional setup and reduced file collision" into oc-dr1-dev am:
b5aca0236f
am:
7cf1adb901
Change-Id: I1c6bc4b85bbcbb2893db1df499db9cb7dd51635e
Maggie White [Fri, 7 Jul 2017 18:26:10 +0000 (18:26 +0000)]
Merge "Additional setup and reduced file collision" into oc-dr1-dev
am:
b5aca0236f
Change-Id: I2b4a19920e567a690eeb79b2c8328bcd7191fdec
TreeHugger Robot [Fri, 7 Jul 2017 18:14:36 +0000 (18:14 +0000)]
Merge "Additional setup and reduced file collision" into oc-dr1-dev
Maggie White [Thu, 6 Jul 2017 00:01:40 +0000 (17:01 -0700)]
Additional setup and reduced file collision
There's some additional setup needed to make sure the devices are all in
the same state, so I added instructions to the README.
I also changed the system_stats functions to use variables to store
string outputs instead of files to avoid collision when running multiple
instances of the script from the same directory.
Finally, I added cleanup at the end to remove the files created in the
process, and some general code cleanup throughout the script.
Bug:
62536649
Test: manual test on several devices
Change-Id: I843a1cefcf6bd11f28e513d735b3bf313442efd2
Eric Biggers [Mon, 15 May 2017 21:19:24 +0000 (14:19 -0700)]
ext4.h: add EXT4_FEATURE_INCOMPAT_ENCRYPT
fs_mgr needs to know the value of the encrypt feature flag (added to
ext4 in upstream kernel v4.1) so it can enable it.
Bug:
36231741
Change-Id: I7475ea8424fa5a2c4712634eada3095e938e97e3
Eric Biggers [Thu, 6 Jul 2017 19:44:40 +0000 (12:44 -0700)]
ext4_sb.h: make feature flags in fs_info 32-bit
The feature flag fields in the ext4 superblock are 32-bit, so they
should be 32-bit in fs_info too.
Bug:
36231741
Change-Id: I719953ac389d1c7f503db0b669c2815c44807f9f
Jin Qian [Thu, 6 Jul 2017 17:05:29 +0000 (17:05 +0000)]
Merge "Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am:
7f60c1a8af" into oc-dr1-dev-plus-aosp
am:
c6ac1de500 -s ours
Change-Id: I369339bcad1f3b7455d5f6b3295be74094e05906
Android Build Merger (Role) [Thu, 6 Jul 2017 16:15:43 +0000 (16:15 +0000)]
Merge "Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am:
7f60c1a8af am:
22dc5b2af3 -s ours"
Android Build Merger (Role) [Thu, 6 Jul 2017 16:15:38 +0000 (16:15 +0000)]
Merge "Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am:
7f60c1a8af am:
48ac112365 -s ours"
Jin Qian [Thu, 6 Jul 2017 16:14:18 +0000 (16:14 +0000)]
Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am:
7f60c1a8af
am:
22dc5b2af3 -s ours
Change-Id: I9f0171d274404b7d138e700fb5043e98bb0aed48
Jin Qian [Thu, 6 Jul 2017 16:14:08 +0000 (16:14 +0000)]
Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am:
7f60c1a8af
am:
48ac112365 -s ours
Change-Id: Ide8b4f037be3e7951d4987e93d0a8c355a3b6da9
Jin Qian [Thu, 6 Jul 2017 16:12:09 +0000 (16:12 +0000)]
Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am:
7f60c1a8af
am:
48ac112365 -s ours
Change-Id: I6fc072a585767e28d92200cf7b1a5d4859c8fe6a
Android Build Merger (Role) [Thu, 6 Jul 2017 16:07:54 +0000 (16:07 +0000)]
Merge "Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am:
7f60c1a8af" into oc-dr1-dev-plus-aosp
Jin Qian [Thu, 6 Jul 2017 16:06:47 +0000 (16:06 +0000)]
Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev
am:
7f60c1a8af
Change-Id: If208ee125530792171cc194a9995588cff2bd219
Jin Qian [Thu, 6 Jul 2017 16:06:30 +0000 (16:06 +0000)]
Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev
am:
7f60c1a8af
Change-Id: I6be2a4583eae7d7ffa1246316309fc7743396b9c
TreeHugger Robot [Thu, 6 Jul 2017 14:24:05 +0000 (14:24 +0000)]
Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev
Jin Qian [Wed, 5 Jul 2017 22:48:00 +0000 (22:48 +0000)]
Merge "Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am:
ec913d2a15" into oc-dr1-dev-plus-aosp
am:
94e877e74e -s ours
Change-Id: Id5620775d1bc3532ba3e5fc026dfc2ddf5928b01
Android Build Merger (Role) [Wed, 5 Jul 2017 22:46:57 +0000 (22:46 +0000)]
Merge "Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am:
ec913d2a15 am:
df9b270886 -s ours"
Android Build Merger (Role) [Wed, 5 Jul 2017 22:46:51 +0000 (22:46 +0000)]
Merge "Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am:
ec913d2a15 am:
df9b270886 -s ours"
Jin Qian [Wed, 5 Jul 2017 22:46:01 +0000 (22:46 +0000)]
Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am:
ec913d2a15
am:
df9b270886 -s ours
Change-Id: I7f9cc3032a9c9f5f009fc50ace25f33e35c46269
Jin Qian [Wed, 5 Jul 2017 22:45:55 +0000 (22:45 +0000)]
Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am:
ec913d2a15
am:
df9b270886 -s ours
Change-Id: Ie2a0a7495696e74c9af44c35e3759219c07d4de9
Android Build Merger (Role) [Wed, 5 Jul 2017 22:45:12 +0000 (22:45 +0000)]
Merge "Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am:
ec913d2a15 am:
345d22c94a -s ours"
Jin Qian [Wed, 5 Jul 2017 22:44:11 +0000 (22:44 +0000)]
Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am:
ec913d2a15
am:
345d22c94a -s ours
Change-Id: Ia235a14890d1538b32e2bef37ba29f1df0dbab1b
Jin Qian [Wed, 5 Jul 2017 22:44:10 +0000 (22:44 +0000)]
Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am:
ec913d2a15
am:
345d22c94a -s ours
Change-Id: I3c0f8f4a7c0f614da34903addc680aa9a6839210
Android Build Merger (Role) [Wed, 5 Jul 2017 22:41:55 +0000 (22:41 +0000)]
Merge "Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am:
ec913d2a15" into oc-dr1-dev-plus-aosp
Jin Qian [Wed, 5 Jul 2017 22:41:12 +0000 (22:41 +0000)]
Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev
am:
ec913d2a15
Change-Id: I7329e6edcd6e5b3ff786d2f74587d254d8b05be0
Jin Qian [Wed, 5 Jul 2017 22:40:53 +0000 (22:40 +0000)]
Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev
am:
ec913d2a15
Change-Id: I15d803cc98a8d9010cabe342a45ca916fb625db7
TreeHugger Robot [Wed, 5 Jul 2017 22:33:36 +0000 (22:33 +0000)]
Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev
Mark Salyzyn [Wed, 28 Jun 2017 14:34:03 +0000 (14:34 +0000)]
Merge "kernel.config: check console-ramoops-0" am:
3cd4b5a765 am:
66a4b1bd79 am:
12981e42a7
am:
6c3e1f1458
Change-Id: I2c090b52d7dee0a4933302aee262b033acbc758a
Mark Salyzyn [Wed, 28 Jun 2017 14:29:33 +0000 (14:29 +0000)]
Merge "kernel.config: check console-ramoops-0" am:
3cd4b5a765 am:
66a4b1bd79
am:
12981e42a7
Change-Id: I0381e6e215a04dd6c4bd63e4a0ae3ddc38085e2b
Mark Salyzyn [Wed, 28 Jun 2017 14:26:04 +0000 (14:26 +0000)]
Merge "kernel.config: check console-ramoops-0" am:
3cd4b5a765
am:
66a4b1bd79
Change-Id: I817d00383d64cf5f4a4562f66f330f0a95fe8e28