OSDN Git Service
Dan Willemsen [Sat, 7 Oct 2017 02:03:02 +0000 (02:03 +0000)]
Merge "Fix SDK build" am:
909fab2235 am:
0951aeb62b
am:
563d11e191
Change-Id: I186b72d05d4beb6b60c06912e32f4b0a77571c52
Dan Willemsen [Sat, 7 Oct 2017 02:01:04 +0000 (02:01 +0000)]
Merge "Fix SDK build" am:
909fab2235
am:
0951aeb62b
Change-Id: I30c1df50004c1297cf39e8e5dca65a9a8fce74d5
Dan Willemsen [Sat, 7 Oct 2017 01:59:59 +0000 (01:59 +0000)]
Merge "Fix SDK build"
am:
909fab2235
Change-Id: I78288d9488e7de354ed0bee1892745434261816a
Dan Willemsen [Sat, 7 Oct 2017 01:54:43 +0000 (01:54 +0000)]
Merge "Fix SDK build"
Dan Willemsen [Sat, 7 Oct 2017 01:52:17 +0000 (18:52 -0700)]
Fix SDK build
Test: m out/host/linux-x86/obj/PACKAGING/simplerperf_script_intermediates/simpleperf_script.zip
Change-Id: Ia45db80e0ee6db5a413817fc85c9498357c085ab
Yabin Cui [Sat, 7 Oct 2017 00:47:27 +0000 (00:47 +0000)]
Merge "simpleperf: add html report interface." am:
e6a6482659 am:
15e0f878b1
am:
c6e767f147
Change-Id: I525f8c7d9fe5a5afd9487fcc2919b41bc9f7a399
Yabin Cui [Sat, 7 Oct 2017 00:45:41 +0000 (00:45 +0000)]
Merge "simpleperf: add html report interface." am:
e6a6482659
am:
15e0f878b1
Change-Id: I300231d95e7e90b66350d01eb5b73207fb5f0e54
Yabin Cui [Sat, 7 Oct 2017 00:43:01 +0000 (00:43 +0000)]
Merge "simpleperf: add html report interface."
am:
e6a6482659
Change-Id: Ica7de55be7036174ff7a128032339261487914e7
Yabin Cui [Sat, 7 Oct 2017 00:36:43 +0000 (00:36 +0000)]
Merge "simpleperf: add html report interface."
Yabin Cui [Tue, 29 Aug 2017 00:23:36 +0000 (17:23 -0700)]
simpleperf: add html report interface.
Also remove unnecessary dependency of jquery/jqueryui in inferno.
Bug: http://b/
66914187
Test: manually run report_html.py.
Test: run test.py.
Change-Id: I963e05df0c38aa6a10a7ca53f77871efca9f2719
Yabin Cui [Fri, 6 Oct 2017 02:03:06 +0000 (02:03 +0000)]
Merge "simpleperf: fix --group option." am:
ac07d6eb1e am:
ed5fb60e00
am:
f033197e6c
Change-Id: I2f833e9a7792e0fb159eb7f8f215f0e341b41b6d
Yabin Cui [Fri, 6 Oct 2017 02:01:36 +0000 (02:01 +0000)]
Merge "simpleperf: fix --group option." am:
ac07d6eb1e
am:
ed5fb60e00
Change-Id: I4b9d65f5935f33fc852e9aed97d428291f57bd79
Yabin Cui [Fri, 6 Oct 2017 01:59:52 +0000 (01:59 +0000)]
Merge "simpleperf: fix --group option."
am:
ac07d6eb1e
Change-Id: I9130646f7549cb707573f37d07ff61ecc3682a45
Treehugger Robot [Fri, 6 Oct 2017 01:49:17 +0000 (01:49 +0000)]
Merge "simpleperf: fix --group option."
Yabin Cui [Thu, 5 Oct 2017 22:18:20 +0000 (15:18 -0700)]
simpleperf: fix --group option.
Bug: None.
Test: simpleperf_unit_test.
Change-Id: I970e52481e63757a37ef3aa51a724d3dba7de6f2
Andreas Huber [Tue, 3 Oct 2017 19:33:19 +0000 (19:33 +0000)]
Merge "Fix mac build." am:
5da045dc1a am:
2cefddbce5
am:
79a353c071
Change-Id: I2c94f7d867fb5b9a844cc005353fc561a32ff589
Andreas Huber [Tue, 3 Oct 2017 19:31:15 +0000 (19:31 +0000)]
Merge "Fix mac build." am:
5da045dc1a
am:
2cefddbce5
Change-Id: I5027f40f9d13186a8670712b9f44105b3329ee5f
Andreas Huber [Tue, 3 Oct 2017 19:28:59 +0000 (19:28 +0000)]
Merge "Fix mac build."
am:
5da045dc1a
Change-Id: Ie180a5c81a6d8f43bb2e100590e3c1b27ac8b89c
Chih-hung Hsieh [Tue, 3 Oct 2017 19:25:56 +0000 (19:25 +0000)]
Merge "Allow -Wformat warnings before they are all fixed." am:
01a2d12df3 am:
cdda70350e
am:
6d12c65cb7
Change-Id: Ifbadd85a785ad77fb9ab5817fc87cb70baf19a20
Treehugger Robot [Tue, 3 Oct 2017 19:20:29 +0000 (19:20 +0000)]
Merge "Fix mac build."
Chih-hung Hsieh [Tue, 3 Oct 2017 19:16:39 +0000 (19:16 +0000)]
Merge "Allow -Wformat warnings before they are all fixed." am:
01a2d12df3
am:
cdda70350e
Change-Id: Iaa30211db348d52f5cb58c39f775317f7117c2e0
Chih-hung Hsieh [Tue, 3 Oct 2017 19:13:19 +0000 (19:13 +0000)]
Merge "Allow -Wformat warnings before they are all fixed."
am:
01a2d12df3
Change-Id: Ic1d9b840218dc7dee230c500f272fcad75522b0f
Chih-hung Hsieh [Tue, 3 Oct 2017 19:04:36 +0000 (19:04 +0000)]
Merge "Allow -Wformat warnings before they are all fixed."
Chih-Hung Hsieh [Tue, 3 Oct 2017 18:59:15 +0000 (11:59 -0700)]
Allow -Wformat warnings before they are all fixed.
Bug:
66996870
Test: build with WITH_TIDY=1
Change-Id: I4ad2d974e3dfe196837266c5017a3360be435e9e
Andreas Huber [Tue, 3 Oct 2017 16:50:39 +0000 (09:50 -0700)]
Fix mac build.
"u64" is either an unsigned long (in __LP64__ builds) or
an unsigned long long (otherwise). This CL adds a format string
"PRIext4u64" to be used in place of "PRIu64" when referring to a
variable of type "u64".
related-to-build
Test: make
Change-Id: I6ef911dda3ebdcc0f895c54325b8a82b57a62ee6
Chih-hung Hsieh [Tue, 3 Oct 2017 15:35:35 +0000 (15:35 +0000)]
Merge "Use -Werror in system/extras" am:
560b2196d5 am:
954d9ce3e7
am:
d79020a5e4
Change-Id: If94da7caa721aa7394ff15819216348600b59691
Chih-hung Hsieh [Tue, 3 Oct 2017 15:34:22 +0000 (15:34 +0000)]
Merge "Use -Werror in system/extras" am:
560b2196d5
am:
954d9ce3e7
Change-Id: I37dbe88c991c3c3b475fba33a29c9bc66c511aed
Chih-hung Hsieh [Tue, 3 Oct 2017 15:31:56 +0000 (15:31 +0000)]
Merge "Use -Werror in system/extras"
am:
560b2196d5
Change-Id: Ib27445c71318d6aa11cf99b48aeb180529d7e11a
Chih-hung Hsieh [Tue, 3 Oct 2017 15:26:07 +0000 (15:26 +0000)]
Merge "Use -Werror in system/extras"
Dan Willemsen [Tue, 3 Oct 2017 03:35:54 +0000 (03:35 +0000)]
Merge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]" am:
0d699ab3d2 am:
8c248c60b2
am:
61a2dfeaaa
Change-Id: I51539c7ca826f4ff2fe654ce4aa9bf0b43155eff
Dan Willemsen [Tue, 3 Oct 2017 03:19:54 +0000 (03:19 +0000)]
Merge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]" am:
0d699ab3d2
am:
8c248c60b2
Change-Id: I2b5127bc84d61900989b88be3cda4088b9d8d117
Dan Willemsen [Tue, 3 Oct 2017 03:04:17 +0000 (03:04 +0000)]
Merge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]"
am:
0d699ab3d2
Change-Id: Ic4ee82a22a3b3167b0a43f20965fb452ce667fc3
Dan Willemsen [Tue, 3 Oct 2017 02:30:06 +0000 (02:30 +0000)]
Merge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]"
Chih-Hung Hsieh [Mon, 2 Oct 2017 22:06:37 +0000 (15:06 -0700)]
Use -Werror in system/extras
* Use system-extras-cflags-defaults
* Move -Wall -Werror from cppflags to cflags
* fix warning on redefinition of MAX_PATH
Bug:
66996870
Test: build with WITH_TIDY=1
Change-Id: Ib14b4d8eece767225a6fef639ed190b343678c00
Dan Willemsen [Mon, 2 Oct 2017 17:41:11 +0000 (10:41 -0700)]
Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]
In the future, target.linux will apply to all targets running a linux kernel
(android, linux_glibc, linux_bionic). So move all current users to the specific
linux_glibc.
There will be another cleanup pass later that will move some instances back to
target.linux if the properties should be shared with target.android and
target.linux_bionic, but target.linux needs to be removed first.
Test: out/soong/build.ninja identical before/after
Change-Id: I79c638f0e5d0db86f14cb62209ece9166ebe8585
Exempt-From-Owner-Approval: build system cleanup
Dan Willemsen [Sat, 30 Sep 2017 01:17:02 +0000 (01:17 +0000)]
Merge "Remove default libraries" am:
6c6b05c47a am:
86e940fdac
am:
6160339f3d
Change-Id: I3e6cc6c40bf5ca9a6fe6bab7604aadf0c9254fac
Tianjie Xu [Sat, 30 Sep 2017 01:13:20 +0000 (01:13 +0000)]
Merge "Add libbase as a dependency for slideshow" am:
e57830b20a am:
b0f9502d00
am:
b990a6154f
Change-Id: Ica1c0f55f2e3c6d1dabdadd74d82f3303de4b18d
Bowgo Tsai [Sat, 30 Sep 2017 01:11:55 +0000 (01:11 +0000)]
Merge "boot_control_copy: switching to C++" am:
512f4b15b2 am:
37a744bcfc
am:
f23f04c04a
Change-Id: I8138e8e33da4a1309e92e6b12cbfee0b4df4af33
Dan Willemsen [Sat, 30 Sep 2017 00:43:05 +0000 (00:43 +0000)]
Merge "Remove default libraries" am:
6c6b05c47a
am:
86e940fdac
Change-Id: I36a46b1dcdd7cf6963eae1fb5e28838ed6d3b468
Dan Willemsen [Fri, 29 Sep 2017 21:53:24 +0000 (21:53 +0000)]
Merge "Remove default libraries"
am:
6c6b05c47a
Change-Id: I16e9d8a83b44453c625b3a8929f36b93161fba9d
Treehugger Robot [Fri, 29 Sep 2017 21:40:42 +0000 (21:40 +0000)]
Merge "Remove default libraries"
Tianjie Xu [Fri, 29 Sep 2017 17:42:37 +0000 (17:42 +0000)]
Merge "Add libbase as a dependency for slideshow" am:
e57830b20a
am:
b0f9502d00
Change-Id: Id282f5d472617f8ea30e40186a87d6a502faa104
Tianjie Xu [Fri, 29 Sep 2017 17:40:04 +0000 (17:40 +0000)]
Merge "Add libbase as a dependency for slideshow"
am:
e57830b20a
Change-Id: I46c7aac9e9c10f1590a04849c19edae958f72c0b
Tianjie Xu [Fri, 29 Sep 2017 17:34:20 +0000 (17:34 +0000)]
Merge "Add libbase as a dependency for slideshow"
Bowgo Tsai [Fri, 29 Sep 2017 09:39:03 +0000 (09:39 +0000)]
Merge "boot_control_copy: switching to C++" am:
512f4b15b2
am:
37a744bcfc
Change-Id: If40002b1af6de5fbb34c9518f4c694ed8edf82e7
Dan Willemsen [Fri, 29 Sep 2017 09:35:40 +0000 (09:35 +0000)]
Merge "Rename libz-host -> libz" am:
52e2821359 am:
4c1cccb5c4
am:
97828709f0
Change-Id: I593fd53509532c1dd1d032bdae9e3c0554eda355
Bowgo Tsai [Fri, 29 Sep 2017 08:37:08 +0000 (08:37 +0000)]
Merge "boot_control_copy: switching to C++"
am:
512f4b15b2
Change-Id: I9108edc16309282d6d57e709241389245663565d
Treehugger Robot [Fri, 29 Sep 2017 06:47:27 +0000 (06:47 +0000)]
Merge "boot_control_copy: switching to C++"
Dan Willemsen [Fri, 29 Sep 2017 04:20:44 +0000 (04:20 +0000)]
Merge "Rename libz-host -> libz" am:
52e2821359
am:
4c1cccb5c4
Change-Id: I5256d828fb036ed6f4a2db3fddc5fb5bd8c0aea0
Dan Willemsen [Fri, 29 Sep 2017 00:13:50 +0000 (17:13 -0700)]
Remove default libraries
libdl is part of system_shared_libs now. -ldl -lpthread -lm are now defaults
for host_ldlibs on Linux and Darwin. -lrt is a default for host_ldlibs on
Linux.
Test: m host
Test: mmma system/extras
Change-Id: I190f2f987392cd21275821645361adc19053c907
Exempt-From-Owner-Approval: build system cleanup
Dan Willemsen [Thu, 28 Sep 2017 22:57:49 +0000 (22:57 +0000)]
Merge "Rename libz-host -> libz"
am:
52e2821359
Change-Id: I1d462077904d8303b763dae78b69f77b5eff6efa
Dan Willemsen [Thu, 28 Sep 2017 20:57:43 +0000 (20:57 +0000)]
Merge "Rename libz-host -> libz"
Tianjie Xu [Thu, 28 Sep 2017 20:49:33 +0000 (13:49 -0700)]
Add libbase as a dependency for slideshow
libminui now depends on libbase
Bug:
67010912
Test: mma
Change-Id: Id12d1641b7d249e63ffd3b23d175aec6fa5ac334
Bowgo Tsai [Thu, 28 Sep 2017 07:18:37 +0000 (15:18 +0800)]
boot_control_copy: switching to C++
fs_mgr_get_entry_for_mount_point() is switching to a C++ only API (using
std::string). Do a minimum conversion here to adopt that change.
Bug:
67024518
Test: make and boot sailfish
Change-Id: I191fd0043815d75a799eb4001437abb107af6e79
Tao Bao [Thu, 28 Sep 2017 04:16:27 +0000 (04:16 +0000)]
Merge "ext4_utils: make file system image reproducible" into oc-mr1-dev
am:
9784ce307f
Change-Id: Icf59233cfc3a6e399894ab92855a8d764e0fb772
Tao Bao [Thu, 28 Sep 2017 04:11:13 +0000 (04:11 +0000)]
Merge "ext4_utils: make file system image reproducible" into oc-mr1-dev
Dan Willemsen [Wed, 27 Sep 2017 23:26:36 +0000 (16:26 -0700)]
Rename libz-host -> libz
Test: m host
Change-Id: I26c41cd885f9a48bb1c02bbd269c3f61f3c4dbdb
Jin Qian [Tue, 29 Aug 2017 00:28:49 +0000 (17:28 -0700)]
ext4_utils: make file system image reproducible
Add flags to set filesystem uuid, hash_seed and mke2fs time.
Bug:
64994964
Change-Id: I38369a3a9dfffefead11c4b8fdd1e6984e61b938
(cherry picked from commit
407a7de4c499ede24dbbeb22d2efe6490a974b0d)
Amaury Medeiros [Wed, 27 Sep 2017 17:14:00 +0000 (17:14 +0000)]
Merge "simpleperf: minor fix in report_sample.proto field" am:
4f613859c8 am:
c103d16a21
am:
2d67d0f52e
Change-Id: Ia86c0a163081bb75f82a760d2de0be6e6ee9d69d
Amaury Medeiros [Wed, 27 Sep 2017 17:12:03 +0000 (17:12 +0000)]
Merge "simpleperf: minor fix in report_sample.proto field" am:
4f613859c8
am:
c103d16a21
Change-Id: I319e8b42a59ba4a29dd3dedf1d896d5b09244737
Amaury Medeiros [Wed, 27 Sep 2017 17:10:31 +0000 (17:10 +0000)]
Merge "simpleperf: minor fix in report_sample.proto field"
am:
4f613859c8
Change-Id: Id0e72bb379f68bc41d75b3f9d77fcab76ad03471
Amaury Medeiros [Wed, 27 Sep 2017 17:06:33 +0000 (17:06 +0000)]
Merge "simpleperf: minor fix in report_sample.proto field"
Amaury Medeiros [Wed, 27 Sep 2017 12:28:53 +0000 (13:28 +0100)]
simpleperf: minor fix in report_sample.proto field
Test: run simpleperf_unit_test.
Change-Id: Ia42ce4c267ddae3640666f73f4a002c88429cb8e
Yabin Cui [Tue, 26 Sep 2017 22:51:41 +0000 (22:51 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
4360250." am:
6b369241f1 am:
5db24b19df
am:
18696bb280
Change-Id: I96ae2f8adead144318e8c920a6f6d0c3517e7c41
Yabin Cui [Tue, 26 Sep 2017 22:37:17 +0000 (22:37 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
4360250." am:
6b369241f1
am:
5db24b19df
Change-Id: Ia61a7dcc7b3bb9b03cbaa15220c9f1f1488ed0d1
Yabin Cui [Tue, 26 Sep 2017 22:35:30 +0000 (22:35 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
4360250."
am:
6b369241f1
Change-Id: Id03e307c652c63daacea22a999e6911c858542cc
Yabin Cui [Tue, 26 Sep 2017 22:28:56 +0000 (22:28 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
4360250."
Yabin Cui [Tue, 26 Sep 2017 17:29:00 +0000 (17:29 +0000)]
Merge "inferno: support building embedded flamegraph." am:
9cc31b876f am:
52f0911911
am:
4a6769c79d
Change-Id: I6a602eb854c70abed0400612e1ae2e31b13430cb
Yabin Cui [Tue, 26 Sep 2017 17:26:58 +0000 (17:26 +0000)]
Merge "inferno: support building embedded flamegraph." am:
9cc31b876f
am:
52f0911911
Change-Id: I164ec32948d65c97391ede40adf74442d1c2a58a
Yabin Cui [Tue, 26 Sep 2017 17:23:26 +0000 (10:23 -0700)]
simpleperf: update simpleperf prebuilts to build
4360250.
Taken from branch aosp-master.
Bug: http://b/
66914187
Test: none.
Change-Id: I31779df7d25c5f7210a2aaa85b4d4200d4972a89
Yabin Cui [Tue, 26 Sep 2017 17:24:31 +0000 (17:24 +0000)]
Merge "inferno: support building embedded flamegraph."
am:
9cc31b876f
Change-Id: I4f6dec36cdfa11d0db51ef94d632790e06f25687
Yabin Cui [Tue, 26 Sep 2017 17:17:03 +0000 (17:17 +0000)]
Merge "inferno: support building embedded flamegraph."
Yabin Cui [Tue, 26 Sep 2017 00:26:54 +0000 (00:26 +0000)]
Merge "simpleperf: Keep record time and android version in perf.data." am:
c34215a771 am:
7c08170f86
am:
70e38cd751
Change-Id: I008c069aa5a1538d90217d186819d629f4eeacf1
Yabin Cui [Tue, 26 Sep 2017 00:24:25 +0000 (00:24 +0000)]
Merge "simpleperf: Keep record time and android version in perf.data." am:
c34215a771
am:
7c08170f86
Change-Id: Ibd9430cf3fcff44eae0ff49426903659289d0d28
Yabin Cui [Tue, 26 Sep 2017 00:22:27 +0000 (00:22 +0000)]
Merge "simpleperf: Keep record time and android version in perf.data."
am:
c34215a771
Change-Id: I0bcc5388e410cbdbf2df3b905e97b98a79ad0ebc
Treehugger Robot [Tue, 26 Sep 2017 00:13:57 +0000 (00:13 +0000)]
Merge "simpleperf: Keep record time and android version in perf.data."
Yabin Cui [Mon, 25 Sep 2017 22:15:15 +0000 (15:15 -0700)]
simpleperf: Keep record time and android version in perf.data.
The record time and android version will be shown in html report.
Record time is useful to distinguish reports.
Android version is useful when checking reason for recording results.
Bug: http://b/
66914187
Test: run simpleperf_unit_test.
Change-Id: I61ad5df380f8b51a3a6bc1f4dfa4bc9f350a4792
Yabin Cui [Mon, 25 Sep 2017 22:54:45 +0000 (15:54 -0700)]
inferno: support building embedded flamegraph.
This is to show embedded flamegraph with other view in a report html.
Bug: http://b/
66914187
Test: run inferno.sh manually.
Change-Id: Ib68b7dcbd41d85d1fb47f1637407e50bd7e93d87
Tao Bao [Mon, 25 Sep 2017 16:07:21 +0000 (16:07 +0000)]
Merge "verity: Fix the broken 'build_verity_tree -A'." am:
97d9efc6ab am:
ab15d60079
am:
838d5fdc31
Change-Id: I7ce460c2ebd5a5312ffc4d6c52316829ab331c51
Tao Bao [Mon, 25 Sep 2017 16:03:50 +0000 (16:03 +0000)]
Merge "verity: Fix the broken 'build_verity_tree -A'." am:
97d9efc6ab
am:
ab15d60079
Change-Id: I01b1c9aad77015eab7bc462f6a9d574a5dbf04f9
Tao Bao [Mon, 25 Sep 2017 16:02:29 +0000 (16:02 +0000)]
Merge "verity: Fix the broken 'build_verity_tree -A'."
am:
97d9efc6ab
Change-Id: Ibbfa251eb6cf53ead264cc2c60c4bb0a030163f8
Tao Bao [Mon, 25 Sep 2017 15:49:12 +0000 (15:49 +0000)]
Merge "verity: Fix the broken 'build_verity_tree -A'."
Tao Bao [Sat, 23 Sep 2017 05:09:32 +0000 (22:09 -0700)]
verity: Fix the broken 'build_verity_tree -A'.
Commit
6eb049322c26431961fb69168a113bfd27016ab3 introduced a bug in
checking if there's any passed-in salt string (via '-A <salt>' or '-a
<salt>'). "salt.data()" should be "salt.empty()", which otherwise may
or may not be nullptr even if salt is empty. This CL fixes the issue.
This CL also removes the duplicate variable 'salt_size', which can be
fully covered by salt.size().
Test: m build_verity_tree;
Test: `build_verity_tree system.img verity.img` gives random root hash
and salt string across runs.
Test: `build_verity_tree -A <hex string> system.img verity.img` gives
identical results across runs.
Test: `build_verity_tree -a <string> system.img verity.img` gives
identical results across runs.
Change-Id: I377e42fc48c0f703dc33d813466f6ef60514bbe5
Yoshitaka Seto [Fri, 22 Sep 2017 01:49:33 +0000 (01:49 +0000)]
Remove pstore related unit tests from CTS
am:
8ffd0b85d3
Change-Id: Id31d7cac5563ff09a931306ec5c614c39e8ad7b7
Yoshitaka Seto [Mon, 31 Jul 2017 03:24:09 +0000 (12:24 +0900)]
Remove pstore related unit tests from CTS
Pstore test cases should not belong to CTS.
The test cases should be a part of GTS if really required.
Test: manual
Bug:
66431569
Bug:
63969981
Bug:
63913130
Signed-off-by: Srinavasa Nagaraju <Srinavasa.Nagaraju@sony.com>
Signed-off-by: Yoshitaka Seto <yoshitaka.seto@sony.com>
Tested-by: Srinavasa Nagaraju <Srinavasa.Nagaraju@sony.com>
Change-Id: Ie91625fd365b17dccdb179758639492da6b49787
Ting-Yuan Huang [Thu, 21 Sep 2017 19:25:34 +0000 (19:25 +0000)]
Merge "ext4_utils: Fix a looping bug and memory leak" am:
1db7fa615d am:
ae908cfb27
am:
d5070279f3
Change-Id: Id7ba7b29f78f631e2c5da78905e8360a070e4686
Ting-Yuan Huang [Thu, 21 Sep 2017 19:25:19 +0000 (19:25 +0000)]
Merge "Fix reduce_allocation()." am:
7d845bafe5 am:
c32774f81e
am:
968853c765
Change-Id: I4df82170e4d9f4661ae1ef8df384cc45dd6e6920
Ting-Yuan Huang [Thu, 21 Sep 2017 19:23:02 +0000 (19:23 +0000)]
Merge "ext4_utils: Fix a looping bug and memory leak" am:
1db7fa615d
am:
ae908cfb27
Change-Id: Ided398b0b112e87c3b0dc13561941d0cb0e4ad9b
Ting-Yuan Huang [Thu, 21 Sep 2017 19:22:47 +0000 (19:22 +0000)]
Merge "Fix reduce_allocation()." am:
7d845bafe5
am:
c32774f81e
Change-Id: I58b9a58d1e6b71da1f0c620afa2371f0cfcf2896
Ting-Yuan Huang [Thu, 21 Sep 2017 19:20:49 +0000 (19:20 +0000)]
Merge "ext4_utils: Fix a looping bug and memory leak"
am:
1db7fa615d
Change-Id: I9f7c608b981a286d25cb5ca2d9587e333808eddc
Ting-Yuan Huang [Thu, 21 Sep 2017 19:20:29 +0000 (19:20 +0000)]
Merge "Fix reduce_allocation()."
am:
7d845bafe5
Change-Id: I59e51d916e3a4dc6aefab2d41a0ad06a473fef1d
Treehugger Robot [Thu, 21 Sep 2017 19:17:34 +0000 (19:17 +0000)]
Merge "ext4_utils: Fix a looping bug and memory leak"
Treehugger Robot [Thu, 21 Sep 2017 19:16:38 +0000 (19:16 +0000)]
Merge "Fix reduce_allocation()."
Yabin Cui [Thu, 21 Sep 2017 01:23:10 +0000 (01:23 +0000)]
Merge "simpleperf: allow inferno to run from any dir." am:
a9e5b352f6 am:
e274d27f2a
am:
2896204393
Change-Id: I2d6bffff9c92f98ca0410923ba7a118903c74e5a
Yabin Cui [Thu, 21 Sep 2017 01:20:11 +0000 (01:20 +0000)]
Merge "simpleperf: allow inferno to run from any dir." am:
a9e5b352f6
am:
e274d27f2a
Change-Id: I532819f154dfccfdc5eb8383c866155e045a3ef1
Yabin Cui [Thu, 21 Sep 2017 01:18:12 +0000 (01:18 +0000)]
Merge "simpleperf: allow inferno to run from any dir."
am:
a9e5b352f6
Change-Id: I33034f54cb0919e1ce5d6152d5a1fbe896ca79b4
Treehugger Robot [Thu, 21 Sep 2017 01:14:34 +0000 (01:14 +0000)]
Merge "simpleperf: allow inferno to run from any dir."
Yabin Cui [Wed, 20 Sep 2017 23:20:04 +0000 (16:20 -0700)]
simpleperf: allow inferno to run from any dir.
Previously inferno.sh/.bat can only run from scripts/, this CL
removes the restriction.
Also add -o option to select report path.
Bug: http://b/
32834638
Test: run test.py.
Change-Id: Ib1651dcd1beedac5be00249150e0b74fea906924
Manoj Gupta [Wed, 20 Sep 2017 00:36:00 +0000 (00:36 +0000)]
Merge "Fix clang static analyzer warnings" am:
797da605d0 am:
b11b9ab538
am:
f8d8a71e1b
Change-Id: Ib910a1a2bc7a5514235d97082b89b67cec616e01
Manoj Gupta [Wed, 20 Sep 2017 00:33:51 +0000 (00:33 +0000)]
Merge "Fix clang static analyzer warnings" am:
797da605d0
am:
b11b9ab538
Change-Id: Ie38a626cc48f5df867bcbaf489c4b2942fb829c7