summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-03-08Merge "Separate system_version and product_version." am: b7b92040c2Sen Jiang
am: 17c7b6045a Change-Id: I7ea71a0659015d41d8744e2baab339926b98eecb
2017-03-08Merge "Separate system_version and product_version."Sen Jiang
am: b7b92040c2 Change-Id: Idd8433d4c4e4d35e44feb706d34ce2609c265c8d
2017-03-08Merge "Separate system_version and product_version."Treehugger Robot
2017-03-07Separate system_version and product_version.Sen Jiang
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)
2017-03-07Merge "simpleperf: adjust sample_freq based on max_sample_rate file." am: ↵Yabin Cui
8e9eabe7f4 am: d2b9b31a63 am: 1085738fdd Change-Id: Ia910018098adaf171beca32002bc0a546d35daa1
2017-03-07Merge "simpleperf: adjust sample_freq based on max_sample_rate file." am: ↵Yabin Cui
8e9eabe7f4 am: d2b9b31a63 Change-Id: Ieb0498aff61487ab773b8c257124fc2543b4fea9
2017-03-07Merge "simpleperf: adjust sample_freq based on max_sample_rate file."Yabin Cui
am: 8e9eabe7f4 Change-Id: I2c993cab3f1a7627e6c2187c02d937570ac9dd64
2017-03-07Merge "simpleperf: adjust sample_freq based on max_sample_rate file."Yabin Cui
2017-03-06simpleperf: adjust sample_freq based on max_sample_rate file.Yabin Cui
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
2017-03-04Merge "Put product_id and product_version to OEM partition." am: dbcd26053b ↵Alex Deymo
am: 1dfe33e52a am: a8e4161eed Change-Id: Ic1b757e3bf371cbffcfb3b993493e935e832faf9
2017-03-04Merge "Put product_id and product_version to OEM partition." am: dbcd26053bAlex Deymo
am: 1dfe33e52a Change-Id: I32bf51ba5866c39209b584032c528c0b8cf6cfdc
2017-03-04Merge "Put product_id and product_version to OEM partition."Alex Deymo
am: dbcd26053b Change-Id: If665126b6b7ddc6cb32b1fb3b375d68dc1bd1684
2017-03-04Merge "Put product_id and product_version to OEM partition."android-o-preview-1o-previewAlex Deymo
2017-03-02Put product_id and product_version to OEM partition.Sen Jiang
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)
2017-02-28Merge "IOshark support to not pre-create files in /system, /vendor, ..."Mohan Srinivasan
2017-02-27IOshark support to not pre-create files in /system, /vendor, ...Mohan Srinivasan
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>
2017-02-26Merge "Remove references to kernel macros." am: 0e82c84aba am: 1016972e58Christopher Ferris
am: 0ad48d8414 Change-Id: I6b3ee5e430ef20713325025bc50b10f5b67f6208
2017-02-26Merge "Remove references to kernel macros." am: 0e82c84abaChristopher Ferris
am: 1016972e58 Change-Id: I1ad17e947ebb3457e3fb708f9c35cdee0afd3452
2017-02-26Merge "Remove references to kernel macros."Christopher Ferris
am: 0e82c84aba Change-Id: Iec87f2ee43ca73500ebb1fda174fcb61891f1f83
2017-02-26Merge "Remove references to kernel macros."Christopher Ferris
2017-02-25Merge "simpleperf: fix a small error." am: 3c7ae46f92 am: 9898014244Yabin Cui
am: 64f5ba0557 Change-Id: Ic1e18a5d27fd3542e1545135dbf4a974c4a45491
2017-02-25Merge "simpleperf: fix a small error." am: 3c7ae46f92Yabin Cui
am: 9898014244 Change-Id: If59978d87ce44508bb438f3d8bda7e69ec256fc5
2017-02-25Merge "simpleperf: fix a small error."Yabin Cui
am: 3c7ae46f92 Change-Id: Ifdc09c4e294387031c142a015f1c2a6c0bc8f265
2017-02-25Merge "simpleperf: fix a small error."Treehugger Robot
2017-02-24simpleperf: fix a small error.Yabin Cui
Test: run binary_cache_builder.py. Change-Id: I78b16b012bba641f82b33b936c94a1acd5bdf275
2017-02-24Remove references to kernel macros.Christopher Ferris
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.
2017-02-24Merge "simpleperf: generate one report for each event attr." am: 10dbaaa726 ↵Yabin Cui
am: 96d4268ea9 am: 3afb86c276 Change-Id: Ica47541c27c8f42aefe4d01d8191c93759c532d3
2017-02-24Merge "simpleperf: generate one report for each event attr." am: 10dbaaa726Yabin Cui
am: 96d4268ea9 Change-Id: I023cd64190c70a85e70701a125dd7573ae3a4832
2017-02-24Merge "simpleperf: generate one report for each event attr."Yabin Cui
am: 10dbaaa726 Change-Id: I1c97e29809a81fad33a916c5b5720ed8cfd13fa3
2017-02-24Merge "simpleperf: generate one report for each event attr."Treehugger Robot
2017-02-24Merge "simpleperf: add --raw-period option for report cmd." am: d0d21b88ce ↵Yabin Cui
am: 7db7e63529 am: b5454fcd35 Change-Id: I19ea2ac84f402d890573f89ac3bd69aa93e56d97
2017-02-24Merge "simpleperf: add --raw-period option for report cmd." am: d0d21b88ceYabin Cui
am: 7db7e63529 Change-Id: Ic1cabc5f9162013e4218a1c67853ed0d38d6fe83
2017-02-24Merge "simpleperf: add --raw-period option for report cmd."Yabin Cui
am: d0d21b88ce Change-Id: Ia2fec638189df5bb8cc1555788ada4d8a9ef3b1e
2017-02-24Merge "simpleperf: add --raw-period option for report cmd."Treehugger Robot
2017-02-23simpleperf: add --raw-period option for report cmd.Yabin Cui
Bug: http://b/35475170 Test: run simpleperf_unit_test. Change-Id: Ib5bae0b775ac2a3e647b7724df01ce0b8deb1a38
2017-02-23Merge "simpleperf: build libsimpleperf_inplace_sampler library." am: ↵Yabin Cui
d9d2318176 am: 81a43f5d2f am: 504ae2f14c Change-Id: I5a23cc8c46bb5d20eb0f0471572c601943a77318
2017-02-23Merge "simpleperf: build libsimpleperf_inplace_sampler library." am: d9d2318176Yabin Cui
am: 81a43f5d2f Change-Id: Iee29eb35371386d719fc14c75d379d9452ae6f6d
2017-02-23simpleperf: generate one report for each event attr.Yabin Cui
Bug: http://b/35475170 Test: run simpleperf_unit_test. Test: run report.py. Change-Id: Ie9329a64c701bce38f7b440c16cb47e99e83db45
2017-02-23Merge "simpleperf: build libsimpleperf_inplace_sampler library."Yabin Cui
am: d9d2318176 Change-Id: If0d17051d5a0f2cbf1ea332fef36f5a0e2c4c1e7
2017-02-23Merge "simpleperf: build libsimpleperf_inplace_sampler library."Yabin Cui
2017-02-23Merge "Use interfaceDescriptor instead of interfaceChain" am: 7e5199f5dd am: ↵Yifan Hong
d14a3dc170 am: 029dfa7805 Change-Id: I02f1e519abe8f6922954a8653fab237516d45d3e
2017-02-23Merge "Use interfaceDescriptor instead of interfaceChain" am: 7e5199f5ddYifan Hong
am: d14a3dc170 Change-Id: I6616e79565ff3cda71199d6055ee77140fe30fdb
2017-02-23Merge "Use interfaceDescriptor instead of interfaceChain"Yifan Hong
am: 7e5199f5dd Change-Id: I1e3ba417e30e2736fe0f1a13c300da7d4e6ad4f6
2017-02-23Merge "Use interfaceDescriptor instead of interfaceChain"Treehugger Robot
2017-02-23Merge "Add a summary (-s) option for easier parseability."Mohan Srinivasan
2017-02-22Use interfaceDescriptor instead of interfaceChainYifan Hong
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
2017-02-22Add a summary (-s) option for easier parseability.Mohan Srinivasan
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>
2017-02-21Merge "Remove external/openssl/include from verity include path." am: ↵Elliott Hughes
f286f3d5ce am: 465a7c717e am: c297fa5ea4 Change-Id: Iced9a0116c92633fb786013d6441c51aebb39a0d
2017-02-21Merge "Remove external/openssl/include from verity include path." am: f286f3d5ceElliott Hughes
am: 465a7c717e Change-Id: Ic1c0a2a89e47d6c3ca4a1a662bab07a817785e7a
2017-02-21Merge "Remove external/openssl/include from verity include path."Elliott Hughes
am: f286f3d5ce Change-Id: I402ad1d1a6920bb15bf15640c4acf1b7fa6471a8