summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-03-15Merge "attempt to fix google_tests.mk with magic"Jed Estep
2017-03-14attempt to fix google_tests.mk with magicJed Estep
Change-Id: I1e3304a91990c09761a9835a2a597b65d1da386c
2017-03-13merge in oc-release history after reset to mastergitbuildkicker
2017-03-13merge in oc-release history after reset to ↵gitbuildkicker
f3ded8f6b9b04b2fc2006e4c141a1517a6107c0d
2017-03-12merge in oc-release history after reset to mastergitbuildkicker
2017-03-11Merge "fstest: replacing fs_mgr_read_fstab() with ↵Bowgo Tsai
fs_mgr_read_fstab_default()" am: 5b88b5289a am: c2d829fe87 am: 3aa9a925be Change-Id: Ic888dd5f1249bdcd020a8c5be9d488696fcf971c
2017-03-11Merge "fstest: replacing fs_mgr_read_fstab() with ↵Bowgo Tsai
fs_mgr_read_fstab_default()" am: 5b88b5289a am: c2d829fe87 Change-Id: If54dc63b8dbfbfce2413d4afc029f4a79d4dda37
2017-03-11Merge "fstest: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()"Bowgo Tsai
am: 5b88b5289a Change-Id: I49e418feb8f60b120ba50146bc89797e05060b00
2017-03-11Merge "fstest: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()"android-n-mr2-preview-2Treehugger Robot
2017-03-10Merge "Replacing fs_mgr_read_fstab() with new fs_mgr APIs" am: 61f66033d5 ↵Bowgo Tsai
am: 5e10463e25 am: 651491544e Change-Id: If6d476001fb55417adc2aad9075d0c4e8ebbeca1
2017-03-10Merge "Replacing fs_mgr_read_fstab() with new fs_mgr APIs" am: 61f66033d5Bowgo Tsai
am: 5e10463e25 Change-Id: I0603fa9c97a71520e4d536e84d3034d7415cfdcc
2017-03-10Merge "Replacing fs_mgr_read_fstab() with new fs_mgr APIs"Bowgo Tsai
am: 61f66033d5 Change-Id: I07bd875763057958220c65e20d49d528c647fbdb
2017-03-10Merge "Replacing fs_mgr_read_fstab() with new fs_mgr APIs"Treehugger Robot
2017-03-10Replacing fs_mgr_read_fstab() with new fs_mgr APIsBowgo Tsai
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
2017-03-10fstest: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()Bowgo Tsai
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
2017-03-09merge in oc-release history after reset to mastergitbuildkicker
2017-03-08mkuserimg_mke2fs: fix empty -E to mke2fs and empty -S to e2fsdroidBen Fennema
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>
2017-03-08merge in oc-release history after reset to mastergitbuildkicker
2017-03-08Merge "Separate system_version and product_version." am: b7b92040c2 am: ↵Sen Jiang
17c7b6045a am: 7efd883330 Change-Id: I69ec2cc2e601db942b830f56c8c33851c0337916
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-05merge in oc-release history after reset to mastergitbuildkicker
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-03-01merge in oc-release history after reset to mastergitbuildkicker
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-27merge in oc-release history after reset to mastergitbuildkicker
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-26merge in oc-release history after reset to mastergitbuildkicker
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 12:45:01 +0000