OSDN Git Service

android-x86/system-extras.git
7 years agoext4_utils: define keyctl_unlink()
Eric Biggers [Wed, 5 Apr 2017 00:31:48 +0000 (00:31 +0000)]
ext4_utils: define keyctl_unlink()
am: 512904129a

Change-Id: I796c67f4ba14f13a99408ad9f54e9a9151ed986f

7 years agoext4_utils: define keyctl_unlink()
Eric Biggers [Mon, 3 Apr 2017 22:46:31 +0000 (15:46 -0700)]
ext4_utils: define keyctl_unlink()

This will allow vold to unlink keys rather than revoking them.

This also removes the keyctl_revoke() definition for now, to discourage
any further (mis)use in the context of ext4 encryption.

Bug: 35988361
Change-Id: Ic94329040f77ffbe2415287fe1202fa61e8a006b
(cherry picked from commit 3f062383deb3e5ba7b16d4728f5dbc44f40bc178)

7 years agoMerge "ext4_utils: add default mke2fs.conf" into oc-dev
Jin Qian [Tue, 4 Apr 2017 21:58:04 +0000 (21:58 +0000)]
Merge "ext4_utils: add default mke2fs.conf" into oc-dev
am: 1cf3416564

Change-Id: I9bf06099b929b00a3255724affdfacba7307c59b

7 years agoMerge "ext4_utils: add default mke2fs.conf" into oc-dev
Jin Qian [Tue, 4 Apr 2017 21:54:28 +0000 (21:54 +0000)]
Merge "ext4_utils: add default mke2fs.conf" into oc-dev

7 years agoFix cts alsr failure.
Dan Cashman [Tue, 4 Apr 2017 21:40:37 +0000 (21:40 +0000)]
Fix cts alsr failure.
am: f92a38e36b

Change-Id: Ifc5148825fdd368c323975fad90f95175ebe491b

7 years agoext4_utils: add default mke2fs.conf
Jin Qian [Fri, 10 Mar 2017 20:14:54 +0000 (12:14 -0800)]
ext4_utils: add default mke2fs.conf

Copy default configs from borg build machine and enable ext_attr.

Bug: 34947454
Test: make systemimage
Change-Id: I011b3d119f35beb0e78b804e62deff229775a0b0
(cherry picked from commit 87eb12642f68f5a8594893618cfab128da82ebd8)

7 years agoFix cts alsr failure.
Dan Cashman [Tue, 4 Apr 2017 17:44:05 +0000 (10:44 -0700)]
Fix cts alsr failure.

/data/nativetest is not present on user builds, so remove tests
depending on that from CTS inclusion.

Bug: 36888825
Bug: 36484285
Test: cts builds and runs (test no longer present)
Change-Id: I7134a1dca6df03fdfa9c0cc7488abd4570a95e33

7 years agoMerge "Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host...
Dan Shi [Tue, 4 Apr 2017 01:44:50 +0000 (01:44 +0000)]
Merge "Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host test cases" am: f0deb9a4dd am: c99398e65d
am: 5aa626a936

Change-Id: Ibe459b552845ae784e1b72e45a5805c556d49eed

7 years agoMerge "Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host...
Dan Shi [Tue, 4 Apr 2017 01:37:03 +0000 (01:37 +0000)]
Merge "Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host test cases" am: f0deb9a4dd
am: c99398e65d

Change-Id: I6f91eeb0640c734ac3679d6095a63c1eb1c11642

7 years agoMerge "Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host...
Dan Shi [Tue, 4 Apr 2017 01:30:57 +0000 (01:30 +0000)]
Merge "Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host test cases"
am: f0deb9a4dd

Change-Id: I3f5a34c752e4094f27145deae243d93f210d30d3

7 years agoMerge "Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host...
Treehugger Robot [Tue, 4 Apr 2017 01:26:55 +0000 (01:26 +0000)]
Merge "Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host test cases"

7 years agoDo not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host test cases
Dan Shi [Mon, 3 Apr 2017 23:46:27 +0000 (16:46 -0700)]
Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host test cases

These two tests may not support host side test yet, don't output the test binary
to testcases folder for now.

Test: make -j simpleperf_unit_test
Bug: 36820939
Change-Id: Ibffdf6a842e1cfabe8aa38dd75a79416a8bd0b23

7 years agoMerge "Removed e4crypt_create_device_key" into oc-dev
Tom Cherry [Mon, 3 Apr 2017 22:06:02 +0000 (22:06 +0000)]
Merge "Removed e4crypt_create_device_key" into oc-dev
am: 2fbc9b893f

Change-Id: I52922052fc3d1d618f9332bd46b583f7e288112b

7 years agoMerge "Removed e4crypt_create_device_key" into oc-dev
Tom Cherry [Mon, 3 Apr 2017 21:58:44 +0000 (21:58 +0000)]
Merge "Removed e4crypt_create_device_key" into oc-dev

7 years agoMerge "Add test config to simpleperf_unit_test and simpleperf_unit_test" am: 4f6fd052...
Dan Shi [Fri, 31 Mar 2017 17:19:19 +0000 (17:19 +0000)]
Merge "Add test config to simpleperf_unit_test and simpleperf_unit_test" am: 4f6fd05205 am: c76a993f79
am: bf837ea212

Change-Id: I201f349f32fd18b5a94c9e907115d9f1fd37819d

7 years agoMerge "Add test config to simpleperf_unit_test and simpleperf_unit_test" am: 4f6fd05205
Dan Shi [Fri, 31 Mar 2017 17:16:43 +0000 (17:16 +0000)]
Merge "Add test config to simpleperf_unit_test and simpleperf_unit_test" am: 4f6fd05205
am: c76a993f79

Change-Id: I8d879ae8f88199c3a479619f446a8facfa1ce194

7 years agoMerge "Add test config to binderAddInts" am: d89f0cb87b am: 33e29525e2
Dan Shi [Fri, 31 Mar 2017 17:16:24 +0000 (17:16 +0000)]
Merge "Add test config to binderAddInts" am: d89f0cb87b am: 33e29525e2
am: 8288531a14

Change-Id: I00dfaece3d4178fa99edba39496887d20941190e

7 years agoMerge "Add test config to time-unit-tests" am: f8289b9e88 am: d48cc6e096
Dan Shi [Fri, 31 Mar 2017 17:16:15 +0000 (17:16 +0000)]
Merge "Add test config to time-unit-tests" am: f8289b9e88 am: d48cc6e096
am: 7a3d4d7556

Change-Id: Ia6d8802579ff2f71d015a2a00dbc84d401509675

7 years agoMerge "Add test config to mmapPerf" am: a2f6b2fe17 am: e988c3ee6a
Dan Shi [Fri, 31 Mar 2017 17:16:06 +0000 (17:16 +0000)]
Merge "Add test config to mmapPerf" am: a2f6b2fe17 am: e988c3ee6a
am: 0f92671105

Change-Id: I26f9f900840de08aab544b36a4af1d93dabe3221

7 years agoMerge "Add test config to perfprofd_test" am: e0d790c82c am: 53011202e2
Dan Shi [Fri, 31 Mar 2017 17:15:58 +0000 (17:15 +0000)]
Merge "Add test config to perfprofd_test" am: e0d790c82c am: 53011202e2
am: f1868180cc

Change-Id: I784fc52414555fe0391e37d9a300bf2913487997

7 years agoMerge "Add test config to simpleperf_unit_test and simpleperf_unit_test"
Dan Shi [Fri, 31 Mar 2017 17:14:11 +0000 (17:14 +0000)]
Merge "Add test config to simpleperf_unit_test and simpleperf_unit_test"
am: 4f6fd05205

Change-Id: If83c79fa1e72b043af12ea67d09e738cd6c95bd3

7 years agoMerge "Add test config to binderAddInts" am: d89f0cb87b
Dan Shi [Fri, 31 Mar 2017 17:13:53 +0000 (17:13 +0000)]
Merge "Add test config to binderAddInts" am: d89f0cb87b
am: 33e29525e2

Change-Id: Ibb463f005f18790c34dbcc0c53b8a663f718d514

7 years agoMerge "Add test config to time-unit-tests" am: f8289b9e88
Dan Shi [Fri, 31 Mar 2017 17:13:43 +0000 (17:13 +0000)]
Merge "Add test config to time-unit-tests" am: f8289b9e88
am: d48cc6e096

Change-Id: I1318a1ea96f5652309dd481ea8b59ce54c95668d

7 years agoMerge "Add test config to mmapPerf" am: a2f6b2fe17
Dan Shi [Fri, 31 Mar 2017 17:13:35 +0000 (17:13 +0000)]
Merge "Add test config to mmapPerf" am: a2f6b2fe17
am: e988c3ee6a

Change-Id: I33354a1899d4206387f08e7ced39d5717a0ee090

7 years agoMerge "Add test config to perfprofd_test" am: e0d790c82c
Dan Shi [Fri, 31 Mar 2017 17:13:26 +0000 (17:13 +0000)]
Merge "Add test config to perfprofd_test" am: e0d790c82c
am: 53011202e2

Change-Id: I958abbc2add81e44bc1bde40beb47c18ef98e399

7 years agoMerge "Add test config to binderAddInts"
Dan Shi [Fri, 31 Mar 2017 17:11:53 +0000 (17:11 +0000)]
Merge "Add test config to binderAddInts"
am: d89f0cb87b

Change-Id: I9b629df0aebd2cbde27a1192addd1581ac405e6a

7 years agoMerge "Add test config to time-unit-tests"
Dan Shi [Fri, 31 Mar 2017 17:11:45 +0000 (17:11 +0000)]
Merge "Add test config to time-unit-tests"
am: f8289b9e88

Change-Id: I9e14a76af68fccc187f2f6adf41b8a08e0a73609

7 years agoMerge "Add test config to mmapPerf"
Dan Shi [Fri, 31 Mar 2017 17:11:36 +0000 (17:11 +0000)]
Merge "Add test config to mmapPerf"
am: a2f6b2fe17

Change-Id: I8273d4b05e3db03f20dc3d05d45d309283abf559

7 years agoMerge "Add test config to perfprofd_test"
Dan Shi [Fri, 31 Mar 2017 17:11:27 +0000 (17:11 +0000)]
Merge "Add test config to perfprofd_test"
am: e0d790c82c

Change-Id: I3e4a8f2b22870bd7ed3ad473a4b7135ff1a2d3c1

7 years agoMerge "Add test config to simpleperf_unit_test and simpleperf_unit_test"
Treehugger Robot [Fri, 31 Mar 2017 17:07:49 +0000 (17:07 +0000)]
Merge "Add test config to simpleperf_unit_test and simpleperf_unit_test"

7 years agoMerge "Add test config to binderAddInts"
Treehugger Robot [Fri, 31 Mar 2017 17:07:35 +0000 (17:07 +0000)]
Merge "Add test config to binderAddInts"

7 years agoMerge "Add test config to time-unit-tests"
Treehugger Robot [Fri, 31 Mar 2017 17:07:28 +0000 (17:07 +0000)]
Merge "Add test config to time-unit-tests"

7 years agoMerge "Add test config to mmapPerf"
Treehugger Robot [Fri, 31 Mar 2017 17:07:11 +0000 (17:07 +0000)]
Merge "Add test config to mmapPerf"

7 years agoMerge "Add test config to perfprofd_test"
Treehugger Robot [Fri, 31 Mar 2017 17:06:57 +0000 (17:06 +0000)]
Merge "Add test config to perfprofd_test"

7 years agoRemoved e4crypt_create_device_key
Janis Danisevskis [Wed, 29 Mar 2017 22:19:23 +0000 (15:19 -0700)]
Removed e4crypt_create_device_key

Init was the only user of e4crypt_create_device_key and
it is not using it any more.

Bug: 36278706
Test: Removed unused code, and codebase still builds.

(cherry picked from commit d151a583479f475fcfb5d016d7d39dadec97ee72)

Change-Id: I5033dc5d315ea6be84fa9d286615c94a057dc1f0

7 years agoMerge "Removed e4crypt_create_device_key" am: 582a79634a am: 6cf3d8775f
Tom Cherry [Fri, 31 Mar 2017 16:47:41 +0000 (16:47 +0000)]
Merge "Removed e4crypt_create_device_key" am: 582a79634a am: 6cf3d8775f
am: ad48884579

Change-Id: I4326d686edb8b0e7bbd27f260597a5c6b8f131c3

7 years agoMerge "Removed e4crypt_create_device_key" am: 582a79634a
Tom Cherry [Fri, 31 Mar 2017 16:45:09 +0000 (16:45 +0000)]
Merge "Removed e4crypt_create_device_key" am: 582a79634a
am: 6cf3d8775f

Change-Id: Icb460a36cabc6181af15f8c8beaf4877934d6a31

7 years agoMerge "Removed e4crypt_create_device_key"
Tom Cherry [Fri, 31 Mar 2017 16:43:08 +0000 (16:43 +0000)]
Merge "Removed e4crypt_create_device_key"
am: 582a79634a

Change-Id: I23e8519eaf880d9d9f76ee651d2af966d1271e8e

7 years agoMerge "Removed e4crypt_create_device_key"
Tom Cherry [Fri, 31 Mar 2017 16:41:00 +0000 (16:41 +0000)]
Merge "Removed e4crypt_create_device_key"

7 years agoSwitch to fs_mgr_read_fstab("/fstab.device")
Bowgo Tsai [Fri, 31 Mar 2017 05:37:44 +0000 (05:37 +0000)]
Switch to fs_mgr_read_fstab("/fstab.device")
am: 4708f734e5

Change-Id: I990ec2207cc50cbf4ca13132b116510546d85f76

7 years agoSwitch to fs_mgr_read_fstab("/fstab.device")
Bowgo Tsai [Wed, 29 Mar 2017 08:07:12 +0000 (16:07 +0800)]
Switch to fs_mgr_read_fstab("/fstab.device")

fstab.device is for backward compatibility in legacy devices.
As it doesn't have fstab entries in device tree (for early mount) so we
can just use the ordinary fs_mgr_read_fstab().

For new devices having early mount, it should use
fs_mgr_read_fstab_default() instead.

Bug: 35811655
Test: boot sailfish
Change-Id: I70b64787e600d6e338e57f2a31bad188a39d433d
(cherry picked from commit 732b20936d9875c06fab847b7f7e255859e7859f)

7 years agoMerge "Switch to fs_mgr_read_fstab("/fstab.device")" am: 4485a7b47d am: 8ecb417ce3
Bowgo Tsai [Fri, 31 Mar 2017 02:37:52 +0000 (02:37 +0000)]
Merge "Switch to fs_mgr_read_fstab("/fstab.device")" am: 4485a7b47d am: 8ecb417ce3
am: 2b0eed2d9c

Change-Id: I27bc2721d1a69c1464fd4984570cdcf270e7fc77

7 years agoMerge "Switch to fs_mgr_read_fstab("/fstab.device")" am: 4485a7b47d
Bowgo Tsai [Fri, 31 Mar 2017 02:35:19 +0000 (02:35 +0000)]
Merge "Switch to fs_mgr_read_fstab("/fstab.device")" am: 4485a7b47d
am: 8ecb417ce3

Change-Id: I5f223563408bc3133e91238ee34894ab13ff4103

7 years agoMerge "Switch to fs_mgr_read_fstab("/fstab.device")"
Bowgo Tsai [Fri, 31 Mar 2017 02:32:52 +0000 (02:32 +0000)]
Merge "Switch to fs_mgr_read_fstab("/fstab.device")"
am: 4485a7b47d

Change-Id: Ibc639cb80e15617fd351dd8a85dcbdd1b60d7bbd

7 years agoMerge "Switch to fs_mgr_read_fstab("/fstab.device")"
Treehugger Robot [Fri, 31 Mar 2017 02:28:29 +0000 (02:28 +0000)]
Merge "Switch to fs_mgr_read_fstab("/fstab.device")"

7 years agoos-release.d: Add system_id.
Sen Jiang [Thu, 30 Mar 2017 07:28:46 +0000 (07:28 +0000)]
os-release.d: Add system_id.
am: f318ca5110  -s ours

Change-Id: I5eb3f9da7f71036e95d66f116c32d98f517cfd9e

7 years agoAdd test config to perfprofd_test
Dan Shi [Thu, 30 Mar 2017 06:36:06 +0000 (23:36 -0700)]
Add test config to perfprofd_test

Design doc:
Generalized Suites & the Unification of APCT & CTS Workflows Design/Roadmap
https://docs.google.com/document/d/1eabK3srlBLouMiBMrNP3xJPiRRdcoCquNxC8gBWPvx8/edit#heading=h.78vup5eivwzo

Details about test configs changes are tracked in doc
https://docs.google.com/document/d/1EWUjJ7fjy8ge_Nk0YQbFdRp8DSHo3z6GU0R8jLgrAcw/edit#

Bug: 35882476
Test: local test
Change-Id: Ia0842c07ee908fbdcb01eefbe810d2d6aeff9bda

7 years agoMerge changes Ice70d9ab,Iba7ac028 am: 01320a387b am: 9c290a08e8
Sen Jiang [Wed, 29 Mar 2017 23:33:47 +0000 (23:33 +0000)]
Merge changes Ice70d9ab,Iba7ac028 am: 01320a387b am: 9c290a08e8
am: f1c07f7c66

Change-Id: I7e2654f6b2cb5fb8971a0809e254189e4952c87b

7 years agoMerge changes Ice70d9ab,Iba7ac028 am: 01320a387b
Sen Jiang [Wed, 29 Mar 2017 23:32:14 +0000 (23:32 +0000)]
Merge changes Ice70d9ab,Iba7ac028 am: 01320a387b
am: 9c290a08e8

Change-Id: Id70264e1b980eb3ea68425fdb44160e364b83515

7 years agoMerge changes Ice70d9ab,Iba7ac028
Sen Jiang [Wed, 29 Mar 2017 23:31:10 +0000 (23:31 +0000)]
Merge changes Ice70d9ab,Iba7ac028
am: 01320a387b

Change-Id: Ie9fcffc1626270c19441590fd75f76fbc907ca88

7 years agoMerge changes Ice70d9ab,Iba7ac028
Treehugger Robot [Wed, 29 Mar 2017 23:24:01 +0000 (23:24 +0000)]
Merge changes Ice70d9ab,Iba7ac028

* changes:
  os-release.d: remove deprecated cfgtree support.
  os-release.d: Add system_id.

7 years agoRemoved e4crypt_create_device_key
Janis Danisevskis [Wed, 29 Mar 2017 22:19:23 +0000 (15:19 -0700)]
Removed e4crypt_create_device_key

Init was the only user of e4crypt_create_device_key and
it is not using it any more.

Bug: 36278706
Test: Removed unused code, and codebase still builds.
Change-Id: Id134a2dbcaf6553353962f5b93883bb3981f217c

7 years agoos-release.d: Add system_id.
Sen Jiang [Fri, 24 Mar 2017 19:44:58 +0000 (12:44 -0700)]
os-release.d: Add system_id.

This is the app id of the SoM stored in the system.

Test: adb shell cat /etc/os-release.d/system_id
Change-Id: Iba7ac028ffa7402f06fbf9c4a3a077eb3414940e
(cherry picked from commit d41148b6c8d59d4f35711028248fc644428ddc57)

7 years agoos-release.d: remove deprecated cfgtree support.
Sen Jiang [Fri, 24 Mar 2017 21:33:35 +0000 (14:33 -0700)]
os-release.d: remove deprecated cfgtree support.

They are from tier 1 and are now dead.

Test: m dist
Change-Id: Ice70d9ab0fe8ff528e2ad5de8fb4ab2bd270ba04
(cherry picked from commit 91ac1f9c0d623383fa7ad453ff70f35086061d07)

7 years agoos-release.d: Add system_id.
Sen Jiang [Fri, 24 Mar 2017 19:44:58 +0000 (12:44 -0700)]
os-release.d: Add system_id.

This is the app id of the SoM stored in the system.

Test: adb shell cat /etc/os-release.d/system_id
Change-Id: Iba7ac028ffa7402f06fbf9c4a3a077eb3414940e
(cherry picked from commit d41148b6c8d59d4f35711028248fc644428ddc57)

7 years agoAdd test config to mmapPerf
Dan Shi [Wed, 29 Mar 2017 19:26:54 +0000 (12:26 -0700)]
Add test config to mmapPerf

Design doc:
Generalized Suites & the Unification of APCT & CTS Workflows Design/Roadmap
https://docs.google.com/document/d/1eabK3srlBLouMiBMrNP3xJPiRRdcoCquNxC8gBWPvx8/edit#heading=h.78vup5eivwzo

Details about test configs changes are tracked in doc
https://docs.google.com/document/d/1EWUjJ7fjy8ge_Nk0YQbFdRp8DSHo3z6GU0R8jLgrAcw/edit#

Bug: 35882476
Test: local test
Change-Id: Ie318c3abd3eb7ee5ad153774dce39f6fad552289

7 years agoAdd test config to binderAddInts
Dan Shi [Wed, 29 Mar 2017 18:00:34 +0000 (11:00 -0700)]
Add test config to binderAddInts

Design doc:
Generalized Suites & the Unification of APCT & CTS Workflows Design/Roadmap
https://docs.google.com/document/d/1eabK3srlBLouMiBMrNP3xJPiRRdcoCquNxC8gBWPvx8/edit#heading=h.78vup5eivwzo

Details about test configs changes are tracked in doc
https://docs.google.com/document/d/1EWUjJ7fjy8ge_Nk0YQbFdRp8DSHo3z6GU0R8jLgrAcw/edit#

Bug: 35882476
Test: local test
Change-Id: I3310cd57d6b3955bc0267e153c6f268f91943faa

7 years agoSwitch to fs_mgr_read_fstab("/fstab.device")
Bowgo Tsai [Wed, 29 Mar 2017 08:07:12 +0000 (16:07 +0800)]
Switch to fs_mgr_read_fstab("/fstab.device")

fstab.device is for backward compatibility in legacy devices.
As it doesn't have fstab entries in device tree (for early mount) so we
can just use the ordinary fs_mgr_read_fstab().

For new devices having early mount, it should use
fs_mgr_read_fstab_default() instead.

Bug: 35811655
Test: boot sailfish
Change-Id: I70b64787e600d6e338e57f2a31bad188a39d433d

7 years agoMerge "Fix the linking error due to libminui change" am: 5e9cc93aca am: d5d88e29d2
Tianjie Xu [Wed, 29 Mar 2017 00:32:57 +0000 (00:32 +0000)]
Merge "Fix the linking error due to libminui change" am: 5e9cc93aca am: d5d88e29d2
am: 68b15e1f28

Change-Id: I6e3ba321b2ba8dd714dc52aeb70ba2d681479891

7 years agoMerge "Fix the linking error due to libminui change" am: 5e9cc93aca
Tianjie Xu [Tue, 28 Mar 2017 20:03:37 +0000 (20:03 +0000)]
Merge "Fix the linking error due to libminui change" am: 5e9cc93aca
am: d5d88e29d2

Change-Id: I855f99a87ace1c509fd8c0d3edc260cdad7257cf
(cherry picked from commit 8a5ec8ef99deefb361c37982a3783b04b9ed22ee)

7 years agoMerge "Fix the linking error due to libminui change" am: 5e9cc93aca am: d5d88e29d2
Tianjie Xu [Tue, 28 Mar 2017 20:12:19 +0000 (20:12 +0000)]
Merge "Fix the linking error due to libminui change" am: 5e9cc93aca am: d5d88e29d2
am: 8a5ec8ef99

Change-Id: Ifebcc15bd75a292156bb207d3dc6b5bb316e7774

7 years agoMerge "Fix the linking error due to libminui change" am: 5e9cc93aca
Tianjie Xu [Tue, 28 Mar 2017 20:03:37 +0000 (20:03 +0000)]
Merge "Fix the linking error due to libminui change" am: 5e9cc93aca
am: d5d88e29d2

Change-Id: I855f99a87ace1c509fd8c0d3edc260cdad7257cf

7 years agoMerge "Fix the linking error due to libminui change"
Tianjie Xu [Tue, 28 Mar 2017 19:53:57 +0000 (19:53 +0000)]
Merge "Fix the linking error due to libminui change"
am: 5e9cc93aca

Change-Id: Ifd0239bc371a1a7ca1a67be62a9efc331ff4dfcb

7 years agoMerge "Fix the linking error due to libminui change"
Tianjie Xu [Tue, 28 Mar 2017 19:42:53 +0000 (19:42 +0000)]
Merge "Fix the linking error due to libminui change"

7 years agoAdd test config to time-unit-tests
Dan Shi [Tue, 28 Mar 2017 19:19:04 +0000 (12:19 -0700)]
Add test config to time-unit-tests

Design doc:
Generalized Suites & the Unification of APCT & CTS Workflows Design/Roadmap
https://docs.google.com/document/d/1eabK3srlBLouMiBMrNP3xJPiRRdcoCquNxC8gBWPvx8/edit#heading=h.78vup5eivwzo

Details about test configs changes are tracked in doc
https://docs.google.com/document/d/1EWUjJ7fjy8ge_Nk0YQbFdRp8DSHo3z6GU0R8jLgrAcw/edit#

Bug: 35882476
Test: local test
Change-Id: I7f5f4f9fae754f0585be0b6c5ba7737bfcd86d86

7 years agoAdd test config to simpleperf_unit_test and simpleperf_unit_test
Dan Shi [Tue, 28 Mar 2017 18:40:50 +0000 (11:40 -0700)]
Add test config to simpleperf_unit_test and simpleperf_unit_test

Design doc:
Generalized Suites & the Unification of APCT & CTS Workflows Design/Roadmap
https://docs.google.com/document/d/1eabK3srlBLouMiBMrNP3xJPiRRdcoCquNxC8gBWPvx8/edit#heading=h.78vup5eivwzo

Details about test configs changes are tracked in doc
https://docs.google.com/document/d/1EWUjJ7fjy8ge_Nk0YQbFdRp8DSHo3z6GU0R8jLgrAcw/edit#

Bug: 35882476
Test: local test
Change-Id: I80a567fcb44ea00d38243fb2bdeac4798024a201

7 years agoMerge "ext4_utils: fix crash when filesystem size is too small" am: 7902acdaa0 am...
Jin Qian [Sat, 25 Mar 2017 22:21:05 +0000 (22:21 +0000)]
Merge "ext4_utils: fix crash when filesystem size is too small" am: 7902acdaa0 am: d57a607ac7
am: 4814dc5fa7

Change-Id: I8459f1a3dbdc2bbb84a86f4376d3e2c59239862a

7 years agoMerge "ext4_utils: fix crash when filesystem size is too small" am: 7902acdaa0
Jin Qian [Sat, 25 Mar 2017 22:18:33 +0000 (22:18 +0000)]
Merge "ext4_utils: fix crash when filesystem size is too small" am: 7902acdaa0
am: d57a607ac7

Change-Id: I6857786fde370caf9c7ea10202e90b8e945d6627

7 years agoMerge "ext4_utils: fix crash when filesystem size is too small"
Jin Qian [Sat, 25 Mar 2017 22:16:04 +0000 (22:16 +0000)]
Merge "ext4_utils: fix crash when filesystem size is too small"
am: 7902acdaa0

Change-Id: Ieb83a45f469eeca6a17cacd1d211b5d3c7fedd15

7 years agoMerge "ext4_utils: fix crash when filesystem size is too small"
Treehugger Robot [Sat, 25 Mar 2017 22:13:37 +0000 (22:13 +0000)]
Merge "ext4_utils: fix crash when filesystem size is too small"

7 years agoext4_utils: fix crash when filesystem size is too small
Jin Qian [Sat, 25 Mar 2017 00:01:54 +0000 (17:01 -0700)]
ext4_utils: fix crash when filesystem size is too small

make_ext4fs crashes if size is less than block size or less than
header size (super block + descriptors + bitmaps). Check the size
and return errors.

Test: run make_ext4fs with small sizes
Bug: 36576677
Change-Id: I61d92e280cdf290054fadda5a045fc839c6fd8fe

7 years agoFix the linking error due to libminui change
Tianjie Xu [Sat, 25 Mar 2017 00:36:01 +0000 (17:36 -0700)]
Fix the linking error due to libminui change

Test: mma
Change-Id: I56be95ee8062b0bccce296dec4909b9eabb7959a

7 years agoMerge "simpleperf: update simpleperf prebuilts to build 3839284." am: 91ddc60836...
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

7 years agoMerge "simpleperf: update simpleperf prebuilts to build 3839284." am: 91ddc60836
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

7 years agoMerge "simpleperf: update simpleperf prebuilts to build 3839284."
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

7 years agoMerge "simpleperf: update simpleperf prebuilts to build 3839284."
Treehugger Robot [Wed, 22 Mar 2017 21:08:46 +0000 (21:08 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build 3839284."

7 years agosimpleperf: 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

7 years agoMerge "simpleperf: add new scripts in sdk artifacts." am: 955ffc9f09 am: d4d6e0c95d
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

7 years agoMerge "simpleperf: add new scripts in sdk artifacts." am: 955ffc9f09
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

7 years agoMerge "simpleperf: add new scripts in sdk artifacts."
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

7 years agoMerge "simpleperf: add new scripts in sdk artifacts."
Treehugger Robot [Tue, 21 Mar 2017 23:54:10 +0000 (23:54 +0000)]
Merge "simpleperf: add new scripts in sdk artifacts."

7 years agosimpleperf: 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

7 years agoMerge "simpleperf: add script to generate proto data used by pprof." am: 94892d4ead...
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

7 years agoMerge "simpleperf: add script to generate proto data used by pprof." am: 94892d4ead
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

7 years agoMerge "simpleperf: add script to generate proto data used by pprof."
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

7 years agoMerge "simpleperf: add script to generate proto data used by pprof."
Yabin Cui [Tue, 21 Mar 2017 17:11:59 +0000 (17:11 +0000)]
Merge "simpleperf: add script to generate proto data used by pprof."

7 years agosimpleperf: 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

7 years agoMerge "IOshark support to parse Linux filesystem ftraces."
Mohan Srinivasan [Wed, 15 Mar 2017 21:42:07 +0000 (21:42 +0000)]
Merge "IOshark support to parse Linux filesystem ftraces."

7 years agoIOshark 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>
7 years agoMerge "attempt to fix google_tests.mk with magic"
Jed Estep [Wed, 15 Mar 2017 04:21:46 +0000 (04:21 +0000)]
Merge "attempt to fix google_tests.mk with magic"

7 years agoattempt 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

7 years agoMerge "fstest: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()" am...
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

7 years agoMerge "fstest: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()" am...
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

7 years agoMerge "fstest: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()"
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

7 years agoMerge "fstest: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()"
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()"

7 years agoMerge "Replacing fs_mgr_read_fstab() with new fs_mgr APIs" am: 61f66033d5 am: 5e10463e25
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

7 years agoMerge "Replacing fs_mgr_read_fstab() with new fs_mgr APIs" am: 61f66033d5
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

7 years agoMerge "Replacing fs_mgr_read_fstab() with new fs_mgr APIs"
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

7 years agoMerge "Replacing fs_mgr_read_fstab() with new fs_mgr APIs"
Treehugger Robot [Fri, 10 Mar 2017 16:06:00 +0000 (16:06 +0000)]
Merge "Replacing fs_mgr_read_fstab() with new fs_mgr APIs"

7 years agoReplacing 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