OSDN Git Service
Yabin Cui [Wed, 22 Mar 2017 21:20:50 +0000 (21:20 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
3839284." am:
91ddc60836 am:
3c996df3b9
am:
159bf30d33
Change-Id: I551a8d13c655858487dbdbbc0889897a2950c3f1
Yabin Cui [Wed, 22 Mar 2017 21:17:46 +0000 (21:17 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
3839284." am:
91ddc60836
am:
3c996df3b9
Change-Id: I93d5ec056cb3fcef495afa4e2670861714911867
Yabin Cui [Wed, 22 Mar 2017 21:16:41 +0000 (21:16 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
3839284."
am:
91ddc60836
Change-Id: Ieea7cf96db623a47488e139d338e2207a1fa3a2f
Treehugger Robot [Wed, 22 Mar 2017 21:08:46 +0000 (21:08 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
3839284."
Yabin Cui [Wed, 22 Mar 2017 19:13:13 +0000 (12:13 -0700)]
simpleperf: update simpleperf prebuilts to build
3839284.
Taken from branch aosp-master.
And remove update.py from the distribution.
Bug: http://b/
35726123
Test: run pprof_proto_generator.py.
Change-Id: I9b8e0c2f804c5e61ef1c9b1eb1aa626d0d849f64
Yabin Cui [Wed, 22 Mar 2017 00:41:02 +0000 (00:41 +0000)]
Merge "simpleperf: add new scripts in sdk artifacts." am:
955ffc9f09 am:
d4d6e0c95d
am:
7a3f05a456
Change-Id: I6895f3f2e61f5922240a039662a8ea3534cdb447
Yabin Cui [Wed, 22 Mar 2017 00:13:42 +0000 (00:13 +0000)]
Merge "simpleperf: add new scripts in sdk artifacts." am:
955ffc9f09
am:
d4d6e0c95d
Change-Id: Ic8f2ed68e863d56a447892657b28687b347c35c2
Yabin Cui [Wed, 22 Mar 2017 00:10:12 +0000 (00:10 +0000)]
Merge "simpleperf: add new scripts in sdk artifacts."
am:
955ffc9f09
Change-Id: I602c1c414bd2abd30a01a50bb45059cfa74b757d
Treehugger Robot [Tue, 21 Mar 2017 23:54:10 +0000 (23:54 +0000)]
Merge "simpleperf: add new scripts in sdk artifacts."
Yabin Cui [Tue, 21 Mar 2017 22:16:34 +0000 (15:16 -0700)]
simpleperf: add new scripts in sdk artifacts.
Bug: http://b/
35726123
Test: run `make sdk -j30`.
Change-Id: I1515afc0d69dbbcc3756b7d93b738039a1174571
Yabin Cui [Tue, 21 Mar 2017 17:25:04 +0000 (17:25 +0000)]
Merge "simpleperf: add script to generate proto data used by pprof." am:
94892d4ead am:
50c4ddad23
am:
3fe89fa08d
Change-Id: If852bc8fac920ff9b1b87fefeb7909589a0ee5dd
Yabin Cui [Tue, 21 Mar 2017 17:20:32 +0000 (17:20 +0000)]
Merge "simpleperf: add script to generate proto data used by pprof." am:
94892d4ead
am:
50c4ddad23
Change-Id: I4bcd5796e144063454d63632eaf43879ce859748
Yabin Cui [Tue, 21 Mar 2017 17:17:01 +0000 (17:17 +0000)]
Merge "simpleperf: add script to generate proto data used by pprof."
am:
94892d4ead
Change-Id: I73afb3476a3cef47b9e9a88556745f07362f44d9
Yabin Cui [Tue, 21 Mar 2017 17:11:59 +0000 (17:11 +0000)]
Merge "simpleperf: add script to generate proto data used by pprof."
Yabin Cui [Thu, 16 Mar 2017 20:00:43 +0000 (13:00 -0700)]
simpleperf: add script to generate proto data used by pprof.
Also change Addr2Line to support inline functions.
Bug: http://b/
35726123
Test: run gen_pprof_proto.py manually.
Change-Id: Ia2f84ac142e7075ea902f3456235db24567e4fcd
Mohan Srinivasan [Wed, 15 Mar 2017 21:42:07 +0000 (21:42 +0000)]
Merge "IOshark support to parse Linux filesystem ftraces."
Mohan Srinivasan [Thu, 9 Mar 2017 19:24:38 +0000 (11:24 -0800)]
IOshark support to parse Linux filesystem ftraces.
IOshark support to input filesystem ftracepooints (readpage(s))
to capture and replay mmap'ed IO (which aren't captured by strace).
The new script collect-straces-ftraces.sh enables the necessary
tracepoints, and collects ftraces and straces compiles these into
intermediate bytecodes which ioshark_bench can then execute.
Test: Generate several monkey based workloads, and use the script
mentioned above to generate bytecodes and feed those into
ioshark_bench.
Change-Id: Iae57f5fdcdce0fedfd85c8d64ee006cc8b5b470d
Signed-off-by: Mohan Srinivasan <srmohan@google.com>
Jed Estep [Wed, 15 Mar 2017 04:21:46 +0000 (04:21 +0000)]
Merge "attempt to fix google_tests.mk with magic"
Jed Estep [Tue, 14 Mar 2017 19:54:21 +0000 (12:54 -0700)]
attempt to fix google_tests.mk with magic
Change-Id: I1e3304a91990c09761a9835a2a597b65d1da386c
Bowgo Tsai [Sat, 11 Mar 2017 04:01:29 +0000 (04:01 +0000)]
Merge "fstest: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()" am:
5b88b5289a am:
c2d829fe87
am:
3aa9a925be
Change-Id: Ic888dd5f1249bdcd020a8c5be9d488696fcf971c
Bowgo Tsai [Sat, 11 Mar 2017 03:57:56 +0000 (03:57 +0000)]
Merge "fstest: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()" am:
5b88b5289a
am:
c2d829fe87
Change-Id: If54dc63b8dbfbfce2413d4afc029f4a79d4dda37
Bowgo Tsai [Sat, 11 Mar 2017 03:54:27 +0000 (03:54 +0000)]
Merge "fstest: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()"
am:
5b88b5289a
Change-Id: I49e418feb8f60b120ba50146bc89797e05060b00
Treehugger Robot [Sat, 11 Mar 2017 03:48:47 +0000 (03:48 +0000)]
Merge "fstest: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()"
Bowgo Tsai [Fri, 10 Mar 2017 16:17:48 +0000 (16:17 +0000)]
Merge "Replacing fs_mgr_read_fstab() with new fs_mgr APIs" am:
61f66033d5 am:
5e10463e25
am:
651491544e
Change-Id: If6d476001fb55417adc2aad9075d0c4e8ebbeca1
Bowgo Tsai [Fri, 10 Mar 2017 16:13:15 +0000 (16:13 +0000)]
Merge "Replacing fs_mgr_read_fstab() with new fs_mgr APIs" am:
61f66033d5
am:
5e10463e25
Change-Id: I0603fa9c97a71520e4d536e84d3034d7415cfdcc
Bowgo Tsai [Fri, 10 Mar 2017 16:09:41 +0000 (16:09 +0000)]
Merge "Replacing fs_mgr_read_fstab() with new fs_mgr APIs"
am:
61f66033d5
Change-Id: I07bd875763057958220c65e20d49d528c647fbdb
Treehugger Robot [Fri, 10 Mar 2017 16:06:00 +0000 (16:06 +0000)]
Merge "Replacing fs_mgr_read_fstab() with new fs_mgr APIs"
Bowgo Tsai [Fri, 10 Mar 2017 11:20:54 +0000 (19:20 +0800)]
Replacing fs_mgr_read_fstab() with new fs_mgr APIs
The fstab settings of early-mounted partitions (e.g., /vendor)
will be in kernel device tree. Switch to the new API to get the
whole settings with those in device tree:
fs_mgr_read_fstab_with_dt("/fstab.device")
The original default /fstab.{ro.hardware} might be moved to
/vendor/etc/. or /odm/etc/. Use another new API to get the default
fstab instead of using the hard-coded /fstab.{ro.hardware}.
This API also includes the settings from device tree:
fs_mgr_read_fstab_default()
Bug:
35811655
Test: build pass
Change-Id: I14bee88b9f599b7bbc2be56042684709e5946de2
Bowgo Tsai [Fri, 10 Mar 2017 09:03:24 +0000 (17:03 +0800)]
fstest: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()
The original default /fstab.{ro.hardware} might be moved to
/vendor/etc/. or /odm/etc/. Use the new API to get the default
fstab instead of using the hard-coded /fstab.{ro.hardware}.
Bug:
35811655
Test: boot sailfish
Change-Id: Ie11a4f22ed449ef90cbcc7117227a99ea9d79110
Ben Fennema [Wed, 8 Mar 2017 22:21:00 +0000 (14:21 -0800)]
mkuserimg_mke2fs: fix empty -E to mke2fs and empty -S to e2fsdroid
not passing in -s caused a -E to be passed to mke2fs without any options
not passing in FILE_CONTEXTS caused a -S to be passed to e2fsdroid
without a file
Test: build oem image (doesn't pass in -s or [FILE_CONTEXTS])
Change-Id: Id00ca79b6b5fdc75e603ab568d74f1a183f8e56b
Signed-off-by: Ben Fennema <fennema@google.com>
Sen Jiang [Wed, 8 Mar 2017 05:11:19 +0000 (05:11 +0000)]
Merge "Separate system_version and product_version." am:
b7b92040c2 am:
17c7b6045a
am:
7efd883330
Change-Id: I69ec2cc2e601db942b830f56c8c33851c0337916
Sen Jiang [Wed, 8 Mar 2017 05:08:49 +0000 (05:08 +0000)]
Merge "Separate system_version and product_version." am:
b7b92040c2
am:
17c7b6045a
Change-Id: I7ea71a0659015d41d8744e2baab339926b98eecb
Sen Jiang [Wed, 8 Mar 2017 05:06:11 +0000 (05:06 +0000)]
Merge "Separate system_version and product_version."
am:
b7b92040c2
Change-Id: Idd8433d4c4e4d35e44feb706d34ce2609c265c8d
Treehugger Robot [Wed, 8 Mar 2017 04:43:56 +0000 (04:43 +0000)]
Merge "Separate system_version and product_version."
Sen Jiang [Wed, 22 Feb 2017 01:16:35 +0000 (17:16 -0800)]
Separate system_version and product_version.
system_version will be at /etc/os-release.d/system_version, no symlink.
product_version still at oem partition, but now has only one number.
Bug:
35364984
Test: m droid dist oem_image custom_images -j
Change-Id: If0f357d29c8dd0cec1ff4999a3c42b0362a45c01
(cherry picked from commit
9b173cccb8bdb750d4cf7855e5379ceee5ba030f)
Yabin Cui [Tue, 7 Mar 2017 19:11:32 +0000 (19:11 +0000)]
Merge "simpleperf: adjust sample_freq based on max_sample_rate file." am:
8e9eabe7f4 am:
d2b9b31a63
am:
1085738fdd
Change-Id: Ia910018098adaf171beca32002bc0a546d35daa1
Yabin Cui [Tue, 7 Mar 2017 19:08:58 +0000 (19:08 +0000)]
Merge "simpleperf: adjust sample_freq based on max_sample_rate file." am:
8e9eabe7f4
am:
d2b9b31a63
Change-Id: Ieb0498aff61487ab773b8c257124fc2543b4fea9
Yabin Cui [Tue, 7 Mar 2017 19:08:22 +0000 (19:08 +0000)]
Merge "simpleperf: adjust sample_freq based on max_sample_rate file."
am:
8e9eabe7f4
Change-Id: I2c993cab3f1a7627e6c2187c02d937570ac9dd64
Yabin Cui [Tue, 7 Mar 2017 19:06:56 +0000 (19:06 +0000)]
Merge "simpleperf: adjust sample_freq based on max_sample_rate file."
Yabin Cui [Tue, 7 Mar 2017 01:05:50 +0000 (17:05 -0800)]
simpleperf: adjust sample_freq based on max_sample_rate file.
Starting from kernel 4.4, perf_event_max_sample_rate can be
adjusted dynamically by the kernel to limit the cpu percentage
used to dump records.
Bug: http://b/
35554543
Test: echo 100 >/proc/sys/kernel/perf_event_max_sample_rate &&
Test: run CtsSimpleperfTestCases
Change-Id: I75f6cbc124c545d05fd56b07c6a868b7ca15cd8a
Alex Deymo [Sat, 4 Mar 2017 01:57:01 +0000 (01:57 +0000)]
Merge "Put product_id and product_version to OEM partition." am:
dbcd26053b am:
1dfe33e52a
am:
a8e4161eed
Change-Id: Ic1b757e3bf371cbffcfb3b993493e935e832faf9
Alex Deymo [Sat, 4 Mar 2017 01:54:02 +0000 (01:54 +0000)]
Merge "Put product_id and product_version to OEM partition." am:
dbcd26053b
am:
1dfe33e52a
Change-Id: I32bf51ba5866c39209b584032c528c0b8cf6cfdc
Alex Deymo [Sat, 4 Mar 2017 01:51:29 +0000 (01:51 +0000)]
Merge "Put product_id and product_version to OEM partition."
am:
dbcd26053b
Change-Id: If665126b6b7ddc6cb32b1fb3b375d68dc1bd1684
Alex Deymo [Sat, 4 Mar 2017 01:46:19 +0000 (01:46 +0000)]
Merge "Put product_id and product_version to OEM partition."
Sen Jiang [Thu, 3 Nov 2016 23:24:14 +0000 (16:24 -0700)]
Put product_id and product_version to OEM partition.
Also create symlinks for each entry in /etc/os-release.d to its corresponding
location in /oem/os-release.d.
Test: m installclean && m droid oem_image dist
Bug:
32555385
Bug:
33211225
Bug:
35804180
(cherry picked from commit
8de8ac139aa289f22f5326af2805a64c0b6bd410)
(cherry picked from commit
4c6f2be8720829eaf8681bcf584f1064e735fa7c)
Mohan Srinivasan [Tue, 28 Feb 2017 20:37:27 +0000 (20:37 +0000)]
Merge "IOshark support to not pre-create files in /system, /vendor, ..."
Mohan Srinivasan [Sat, 25 Feb 2017 00:34:28 +0000 (16:34 -0800)]
IOshark support to not pre-create files in /system, /vendor, ...
1) Add support to IOshark to not pre-create files that the workload
read from /system, /vendor and other read-only partitions. Instead
we just read the underlying files directly.
2) This support is implemented under a new -q (quick) mode.
3) Other misc fixes to do a setrlimit(NO_FD) so we don't run out
of fds during test.
4) Also commiting raw strace files from several monkey runs so we
can compile those if we make on disk IOshark format changes in the
future.
Test: Run IOshark with different workloads to make sure that this
skipping of pre-creation works fine.
Change-Id: Ic025cb0162eca479d9f529846e619dd4b71aa490
Signed-off-by: Mohan Srinivasan <srmohan@google.com>
Christopher Ferris [Sun, 26 Feb 2017 18:41:23 +0000 (18:41 +0000)]
Merge "Remove references to kernel macros." am:
0e82c84aba am:
1016972e58
am:
0ad48d8414
Change-Id: I6b3ee5e430ef20713325025bc50b10f5b67f6208
Christopher Ferris [Sun, 26 Feb 2017 18:37:52 +0000 (18:37 +0000)]
Merge "Remove references to kernel macros." am:
0e82c84aba
am:
1016972e58
Change-Id: I1ad17e947ebb3457e3fb708f9c35cdee0afd3452
Christopher Ferris [Sun, 26 Feb 2017 18:34:22 +0000 (18:34 +0000)]
Merge "Remove references to kernel macros."
am:
0e82c84aba
Change-Id: Iec87f2ee43ca73500ebb1fda174fcb61891f1f83
Christopher Ferris [Sun, 26 Feb 2017 18:28:04 +0000 (18:28 +0000)]
Merge "Remove references to kernel macros."
Yabin Cui [Sat, 25 Feb 2017 00:41:23 +0000 (00:41 +0000)]
Merge "simpleperf: fix a small error." am:
3c7ae46f92 am:
9898014244
am:
64f5ba0557
Change-Id: Ic1e18a5d27fd3542e1545135dbf4a974c4a45491
Yabin Cui [Sat, 25 Feb 2017 00:38:23 +0000 (00:38 +0000)]
Merge "simpleperf: fix a small error." am:
3c7ae46f92
am:
9898014244
Change-Id: If59978d87ce44508bb438f3d8bda7e69ec256fc5
Yabin Cui [Sat, 25 Feb 2017 00:35:54 +0000 (00:35 +0000)]
Merge "simpleperf: fix a small error."
am:
3c7ae46f92
Change-Id: Ifdc09c4e294387031c142a015f1c2a6c0bc8f265
Treehugger Robot [Sat, 25 Feb 2017 00:31:13 +0000 (00:31 +0000)]
Merge "simpleperf: fix a small error."
Yabin Cui [Fri, 24 Feb 2017 20:37:42 +0000 (12:37 -0800)]
simpleperf: fix a small error.
Test: run binary_cache_builder.py.
Change-Id: I78b16b012bba641f82b33b936c94a1acd5bdf275
Christopher Ferris [Fri, 24 Feb 2017 00:00:27 +0000 (16:00 -0800)]
Remove references to kernel macros.
The macros __force, __bitwise, __user are related to a kernel tool called
sparse to find kernel bugs. These macros are always defined as nothing
in the current uapi kernel header files, so these don't need to be here.
Change-Id: Ia29b0ddbe80298dc19b170c927f1910e14af2c6b
Test: Builds without warnings/errors.
Yabin Cui [Fri, 24 Feb 2017 02:18:53 +0000 (02:18 +0000)]
Merge "simpleperf: generate one report for each event attr." am:
10dbaaa726 am:
96d4268ea9
am:
3afb86c276
Change-Id: Ica47541c27c8f42aefe4d01d8191c93759c532d3
Yabin Cui [Fri, 24 Feb 2017 02:16:22 +0000 (02:16 +0000)]
Merge "simpleperf: generate one report for each event attr." am:
10dbaaa726
am:
96d4268ea9
Change-Id: I023cd64190c70a85e70701a125dd7573ae3a4832
Yabin Cui [Fri, 24 Feb 2017 02:13:50 +0000 (02:13 +0000)]
Merge "simpleperf: generate one report for each event attr."
am:
10dbaaa726
Change-Id: I1c97e29809a81fad33a916c5b5720ed8cfd13fa3
Treehugger Robot [Fri, 24 Feb 2017 02:09:19 +0000 (02:09 +0000)]
Merge "simpleperf: generate one report for each event attr."
Yabin Cui [Fri, 24 Feb 2017 02:06:40 +0000 (02:06 +0000)]
Merge "simpleperf: add --raw-period option for report cmd." am:
d0d21b88ce am:
7db7e63529
am:
b5454fcd35
Change-Id: I19ea2ac84f402d890573f89ac3bd69aa93e56d97
Yabin Cui [Fri, 24 Feb 2017 02:03:41 +0000 (02:03 +0000)]
Merge "simpleperf: add --raw-period option for report cmd." am:
d0d21b88ce
am:
7db7e63529
Change-Id: Ic1cabc5f9162013e4218a1c67853ed0d38d6fe83
Yabin Cui [Fri, 24 Feb 2017 02:01:40 +0000 (02:01 +0000)]
Merge "simpleperf: add --raw-period option for report cmd."
am:
d0d21b88ce
Change-Id: Ia2fec638189df5bb8cc1555788ada4d8a9ef3b1e
Treehugger Robot [Fri, 24 Feb 2017 01:57:06 +0000 (01:57 +0000)]
Merge "simpleperf: add --raw-period option for report cmd."
Yabin Cui [Fri, 24 Feb 2017 00:27:09 +0000 (16:27 -0800)]
simpleperf: add --raw-period option for report cmd.
Bug: http://b/
35475170
Test: run simpleperf_unit_test.
Change-Id: Ib5bae0b775ac2a3e647b7724df01ce0b8deb1a38
Yabin Cui [Thu, 23 Feb 2017 23:59:44 +0000 (23:59 +0000)]
Merge "simpleperf: build libsimpleperf_inplace_sampler library." am:
d9d2318176 am:
81a43f5d2f
am:
504ae2f14c
Change-Id: I5a23cc8c46bb5d20eb0f0471572c601943a77318
Yabin Cui [Thu, 23 Feb 2017 23:56:16 +0000 (23:56 +0000)]
Merge "simpleperf: build libsimpleperf_inplace_sampler library." am:
d9d2318176
am:
81a43f5d2f
Change-Id: Iee29eb35371386d719fc14c75d379d9452ae6f6d
Yabin Cui [Thu, 23 Feb 2017 23:54:11 +0000 (15:54 -0800)]
simpleperf: generate one report for each event attr.
Bug: http://b/
35475170
Test: run simpleperf_unit_test.
Test: run report.py.
Change-Id: Ie9329a64c701bce38f7b440c16cb47e99e83db45
Yabin Cui [Thu, 23 Feb 2017 23:53:46 +0000 (23:53 +0000)]
Merge "simpleperf: build libsimpleperf_inplace_sampler library."
am:
d9d2318176
Change-Id: If0d17051d5a0f2cbf1ea332fef36f5a0e2c4c1e7
Yabin Cui [Thu, 23 Feb 2017 23:50:32 +0000 (23:50 +0000)]
Merge "simpleperf: build libsimpleperf_inplace_sampler library."
Yifan Hong [Thu, 23 Feb 2017 21:47:21 +0000 (21:47 +0000)]
Merge "Use interfaceDescriptor instead of interfaceChain" am:
7e5199f5dd am:
d14a3dc170
am:
029dfa7805
Change-Id: I02f1e519abe8f6922954a8653fab237516d45d3e
Yifan Hong [Thu, 23 Feb 2017 21:44:51 +0000 (21:44 +0000)]
Merge "Use interfaceDescriptor instead of interfaceChain" am:
7e5199f5dd
am:
d14a3dc170
Change-Id: I6616e79565ff3cda71199d6055ee77140fe30fdb
Yifan Hong [Thu, 23 Feb 2017 21:42:51 +0000 (21:42 +0000)]
Merge "Use interfaceDescriptor instead of interfaceChain"
am:
7e5199f5dd
Change-Id: I1e3ba417e30e2736fe0f1a13c300da7d4e6ad4f6
Treehugger Robot [Thu, 23 Feb 2017 21:36:32 +0000 (21:36 +0000)]
Merge "Use interfaceDescriptor instead of interfaceChain"
Mohan Srinivasan [Thu, 23 Feb 2017 19:29:03 +0000 (19:29 +0000)]
Merge "Add a summary (-s) option for easier parseability."
Yifan Hong [Thu, 23 Feb 2017 02:11:18 +0000 (18:11 -0800)]
Use interfaceDescriptor instead of interfaceChain
wherever suits. Sementically, interfaceDescriptor
returns the first element of interfaceChain; use
interfaceDescriptor when the rest of the elements
aren't used.
Bug:
34136228
Test: pass
Change-Id: Icc78e7e9b17b7c51c705c20d51c2fbac5b1c5dd7
Mohan Srinivasan [Thu, 23 Feb 2017 00:19:25 +0000 (16:19 -0800)]
Add a summary (-s) option for easier parseability.
Add a summary (-s) option that dumps out the metrics from the run
on one single line for easier parseability. Requested by Shankhoneer
for easier integration of ioshark into tradefed.
Test: Test the new -s option (and combination with other options)
to make sure everything continues to work.
Change-Id: Ic27306a89bb501ce5b31f8df2ef9c583f56e9e4a
Signed-off-by: Mohan Srinivasan <srmohan@google.com>
Elliott Hughes [Tue, 21 Feb 2017 21:26:29 +0000 (21:26 +0000)]
Merge "Remove external/openssl/include from verity include path." am:
f286f3d5ce am:
465a7c717e
am:
c297fa5ea4
Change-Id: Iced9a0116c92633fb786013d6441c51aebb39a0d
Elliott Hughes [Tue, 21 Feb 2017 21:24:33 +0000 (21:24 +0000)]
Merge "Remove external/openssl/include from verity include path." am:
f286f3d5ce
am:
465a7c717e
Change-Id: Ic1c0a2a89e47d6c3ca4a1a662bab07a817785e7a
Elliott Hughes [Tue, 21 Feb 2017 21:22:28 +0000 (21:22 +0000)]
Merge "Remove external/openssl/include from verity include path."
am:
f286f3d5ce
Change-Id: I402ad1d1a6920bb15bf15640c4acf1b7fa6471a8
Treehugger Robot [Tue, 21 Feb 2017 21:19:25 +0000 (21:19 +0000)]
Merge "Remove external/openssl/include from verity include path."
Yifan Hong [Tue, 21 Feb 2017 18:34:40 +0000 (18:34 +0000)]
Merge "bootctl: Return<T> is non-copyable." am:
c38d4f183c am:
7df6e74999
am:
6830681619
Change-Id: I3a784bdfe3ffaebb85f7635dac8f561996f7abe5
Yifan Hong [Tue, 21 Feb 2017 18:33:09 +0000 (18:33 +0000)]
Merge "bootctl: Return<T> is non-copyable." am:
c38d4f183c
am:
7df6e74999
Change-Id: I0d48172354849ed086c906588a16cafd73d9ab2d
Yifan Hong [Tue, 21 Feb 2017 18:30:33 +0000 (18:30 +0000)]
Merge "bootctl: Return<T> is non-copyable."
am:
c38d4f183c
Change-Id: I6e8044692697b34f57f8d6f02f82c810df8299d6
Yifan Hong [Tue, 21 Feb 2017 18:25:00 +0000 (18:25 +0000)]
Merge "bootctl: Return<T> is non-copyable."
Elliott Hughes [Sun, 19 Feb 2017 17:13:33 +0000 (09:13 -0800)]
Remove external/openssl/include from verity include path.
Bug: N/A
Test: builds
Change-Id: I7f13cd6c3edcff436676e93ca305e07ba6a92b08
Yifan Hong [Fri, 17 Feb 2017 22:35:07 +0000 (14:35 -0800)]
bootctl: Return<T> is non-copyable.
By copying the Return<T> in handl_return, the original
Return<T> object is left status unchecked when it is destroyed.
Test: compiles
Change-Id: I7bf21370e8323374deb9a8d3f252e9742357f000
Yabin Cui [Wed, 15 Feb 2017 23:53:26 +0000 (23:53 +0000)]
Merge "simpleperf: build cts test running in app context." am:
ff972054e9 am:
5710e45719 am:
11125c7333
am:
627570048d
Change-Id: I96998f3480d524969ffa394e25da5c92c7abe45e
Yunlian Jiang [Wed, 15 Feb 2017 23:53:08 +0000 (23:53 +0000)]
Merge "fix potential leak of memory pointed." am:
d1506c64ad am:
a825c78434 am:
85877ba13e
am:
ea5af81402
Change-Id: Ib00d22a850a007049435e856e8326312338b2d3a
Yabin Cui [Wed, 15 Feb 2017 23:49:23 +0000 (23:49 +0000)]
Merge "simpleperf: build cts test running in app context." am:
ff972054e9 am:
5710e45719
am:
11125c7333
Change-Id: I27e1e246e370bf56bbbc74274b3514b0a5546b90
Yunlian Jiang [Wed, 15 Feb 2017 23:49:04 +0000 (23:49 +0000)]
Merge "fix potential leak of memory pointed." am:
d1506c64ad am:
a825c78434
am:
85877ba13e
Change-Id: I6208bbf3c55c0def7d8f87347c0983cf640f60c6
Yabin Cui [Wed, 15 Feb 2017 23:42:35 +0000 (23:42 +0000)]
Merge "simpleperf: build cts test running in app context." am:
ff972054e9
am:
5710e45719
Change-Id: Ifdaf61899cf5c89055ebf047fd090d94b2ea6764
Yunlian Jiang [Wed, 15 Feb 2017 23:42:11 +0000 (23:42 +0000)]
Merge "fix potential leak of memory pointed." am:
d1506c64ad
am:
a825c78434
Change-Id: Ifa43447bddd0ebe7e35a1a2a7ee9a5072d20b57b
Yabin Cui [Wed, 15 Feb 2017 23:39:18 +0000 (23:39 +0000)]
Merge "simpleperf: build cts test running in app context."
am:
ff972054e9
Change-Id: Idb6e09b061dbf836ae0207fd2b7ecf203568f027
Yunlian Jiang [Wed, 15 Feb 2017 23:38:59 +0000 (23:38 +0000)]
Merge "fix potential leak of memory pointed."
am:
d1506c64ad
Change-Id: I1ff731e498540f4927355154069e9a6a997bc926
Yabin Cui [Wed, 15 Feb 2017 23:13:11 +0000 (23:13 +0000)]
Merge "simpleperf: build cts test running in app context."
Mohan Srinivasan [Wed, 15 Feb 2017 23:11:35 +0000 (23:11 +0000)]
Merge "Query for device and then set the blockdev name."
Treehugger Robot [Wed, 15 Feb 2017 22:57:36 +0000 (22:57 +0000)]
Merge "fix potential leak of memory pointed."
Mohan Srinivasan [Wed, 15 Feb 2017 20:39:35 +0000 (12:39 -0800)]
Query for device and then set the blockdev name.
IOshark uses /proc/diskstats to get various stats. It needs a
block device name for doing this. The block device was hardcoded
as sda (Marlin/Sailfish). Query the device productname and use
this to set the block device name instead. Needed to make IOshark
work on non-M/S device.
Test: Testing the change on marlin as well as bullhead (which
covers Sailfish, Shamu and Angler as well).
Change-Id: Id9d7071019112cede1fd5e5c1f2c62f2fc4b6e65
Signed-off-by: Mohan Srinivasan <srmohan@google.com>