OSDN Git Service

android-x86/system-extras.git
5 years agoMerge "libjsonverify: allow option for missing files." am: ea299553a0 am: e6045ac0f6
Yifan Hong [Mon, 18 Mar 2019 17:16:09 +0000 (10:16 -0700)]
Merge "libjsonverify: allow option for missing files." am: ea299553a0 am: e6045ac0f6
am: 508acad44a

Change-Id: I91fb88cba5ffefb64d8e21759af446bd3b0757e4

5 years agoMerge "libjsonverify: allow option for missing files." am: ea299553a0
Yifan Hong [Mon, 18 Mar 2019 17:11:21 +0000 (10:11 -0700)]
Merge "libjsonverify: allow option for missing files." am: ea299553a0
am: e6045ac0f6

Change-Id: I405edd0c77904ebc3b57dfa26709024d12ba6e75

5 years agoMerge "libjsonverify: allow option for missing files."
Yifan Hong [Mon, 18 Mar 2019 17:06:21 +0000 (10:06 -0700)]
Merge "libjsonverify: allow option for missing files."
am: ea299553a0

Change-Id: Ia2cadf6e732116e8c8db8b3d683fed6dc1dc6a09

5 years agoMerge "libjsonverify: allow option for missing files."
Yifan Hong [Mon, 18 Mar 2019 16:53:47 +0000 (16:53 +0000)]
Merge "libjsonverify: allow option for missing files."

5 years agolibjsonverify: allow option for missing files.
Yifan Hong [Tue, 5 Mar 2019 00:27:11 +0000 (16:27 -0800)]
libjsonverify: allow option for missing files.

When 'optional' is set to true:
- If file is missing, test pass (with logs)
- If file is present but empty, test fails
- If file is present but in wrong format, test fails

Test: vts_processgroup_validate_test
Bug: 123664216
Change-Id: Ib6640c3c1ce159c5cac068042af564d98c9bbb1f

5 years ago[automerger skipped] Merge "Rename data/pkg_staging to data/app-staging" am: aac8abab...
Gavin Corkery [Thu, 14 Mar 2019 14:44:32 +0000 (07:44 -0700)]
[automerger skipped] Merge "Rename data/pkg_staging to data/app-staging" am: aac8abab9d am: 11a29880f3
am: cd4adb6b27 -s ours
am skip reason: change_id I73367a60c23ca17d0557253bea25279c104e1e53 with SHA1 671b42d624 is in history

Change-Id: I5b61235f4f3c41662107bc3729be0eee768e41e2

5 years agoMerge "Rename data/pkg_staging to data/app-staging" am: aac8abab9d
Gavin Corkery [Thu, 14 Mar 2019 14:32:44 +0000 (07:32 -0700)]
Merge "Rename data/pkg_staging to data/app-staging" am: aac8abab9d
am: 11a29880f3

Change-Id: Ifea950f6fd40fd0085fa8723b478bcbbae6cdbfc

5 years agoMerge "Rename data/pkg_staging to data/app-staging"
Gavin Corkery [Thu, 14 Mar 2019 14:22:40 +0000 (07:22 -0700)]
Merge "Rename data/pkg_staging to data/app-staging"
am: aac8abab9d

Change-Id: I606af9209c8c24edda1e619bb0d495ee103395d5

5 years agoMerge "Rename data/pkg_staging to data/app-staging"
Gavin Corkery [Thu, 14 Mar 2019 14:14:38 +0000 (14:14 +0000)]
Merge "Rename data/pkg_staging to data/app-staging"

5 years agoRename data/pkg_staging to data/app-staging
Gavin Corkery [Wed, 27 Feb 2019 11:18:03 +0000 (11:18 +0000)]
Rename data/pkg_staging to data/app-staging

Test: n/a
Bug: 126330086

Change-Id: I73367a60c23ca17d0557253bea25279c104e1e53
Merged-In: I73367a60c23ca17d0557253bea25279c104e1e53

5 years ago[automerger skipped] Merge "DO NOT MERGE - Skip PPRL.190305.001 into master" am:...
The Android Open Source Project [Mon, 11 Mar 2019 21:52:27 +0000 (14:52 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Skip PPRL.190305.001 into master" am: 2b19df1b56 -s ours am: 1705924845 -s ours
am: d3fb876174 -s ours
am skip reason: subject contains skip directive

Change-Id: I53da45b4290094d1f815a4f232b5cf05221bb2f1

5 years ago[automerger skipped] DO NOT MERGE - Skip PPRL.190305.001 into master am: 380f832144...
The Android Open Source Project [Mon, 11 Mar 2019 21:36:11 +0000 (14:36 -0700)]
[automerger skipped] DO NOT MERGE - Skip PPRL.190305.001 into master am: 380f832144 -s ours am: 6693200241 -s ours
am: bfc833431d -s ours
am skip reason: subject contains skip directive

Change-Id: I2d69a86d5ebc484fd5505b8e8fa45be7f374ce2d

5 years ago[automerger skipped] Merge "DO NOT MERGE - Skip PPRL.190305.001 into master" am:...
The Android Open Source Project [Mon, 11 Mar 2019 21:16:55 +0000 (14:16 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Skip PPRL.190305.001 into master" am: 2b19df1b56 -s ours
am: 1705924845 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie7b047a9d68c59f681eb8294673e0b377541079b

5 years ago[automerger skipped] DO NOT MERGE - Skip PPRL.190305.001 into master am: 380f832144...
The Android Open Source Project [Mon, 11 Mar 2019 21:06:06 +0000 (14:06 -0700)]
[automerger skipped] DO NOT MERGE - Skip PPRL.190305.001 into master am: 380f832144 -s ours
am: 6693200241 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic39fe91ac6ddfd26a1dfa346e87e1ebe522888ed

5 years ago[automerger skipped] Merge "DO NOT MERGE - Skip PPRL.190305.001 into master"
The Android Open Source Project [Mon, 11 Mar 2019 20:40:05 +0000 (13:40 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Skip PPRL.190305.001 into master"
am: 2b19df1b56 -s ours
am skip reason: subject contains skip directive

Change-Id: I4000c2a5804e4934521f1af82da522d7b3ea11e6

5 years ago[automerger skipped] DO NOT MERGE - Skip PPRL.190305.001 into master
The Android Open Source Project [Mon, 11 Mar 2019 20:09:02 +0000 (13:09 -0700)]
[automerger skipped] DO NOT MERGE - Skip PPRL.190305.001 into master
am: 380f832144 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibc1bb86c7b497bf925489f2053ab2863c5052fe5

5 years agoMerge "DO NOT MERGE - Skip PPRL.190305.001 into master"
Treehugger Robot [Mon, 11 Mar 2019 19:43:56 +0000 (19:43 +0000)]
Merge "DO NOT MERGE - Skip PPRL.190305.001 into master"

5 years agoDO NOT MERGE - Skip PPRL.190305.001 into master
The Android Open Source Project [Mon, 11 Mar 2019 19:00:42 +0000 (12:00 -0700)]
DO NOT MERGE - Skip PPRL.190305.001 into master

Bug: 127812889
Change-Id: I58060ed58fb41b540f42431bb994b6370a53812c

5 years agoMerge "Rename data/pkg_staging to data/app-staging"
Gavin Corkery [Sat, 9 Mar 2019 12:41:28 +0000 (12:41 +0000)]
Merge "Rename data/pkg_staging to data/app-staging"

5 years agoMerge "Use unique_ptr for Maps object." am: 00b2081911 am: 5fd15b8e87
Florian Mayer [Wed, 6 Mar 2019 16:55:15 +0000 (08:55 -0800)]
Merge "Use unique_ptr for Maps object." am: 00b2081911 am: 5fd15b8e87
am: e903d206ed

Change-Id: I31c49889fe71f7d917d40fc4f8f8d48cf159e3ce

5 years agoMerge "Use unique_ptr for Maps object." am: 00b2081911
Florian Mayer [Wed, 6 Mar 2019 16:50:51 +0000 (08:50 -0800)]
Merge "Use unique_ptr for Maps object." am: 00b2081911
am: 5fd15b8e87

Change-Id: I6c6ff9150ca1d6093531a0d05681b1b30db31d7b

5 years agoMerge "Use unique_ptr for Maps object."
Florian Mayer [Wed, 6 Mar 2019 16:46:50 +0000 (08:46 -0800)]
Merge "Use unique_ptr for Maps object."
am: 00b2081911

Change-Id: Ief662c58d50300e2d91d88f272e89d7dccc3117c

5 years agoMerge "Use unique_ptr for Maps object."
Florian Mayer [Wed, 6 Mar 2019 16:31:10 +0000 (16:31 +0000)]
Merge "Use unique_ptr for Maps object."

5 years agoMerge "Add a postinstall script for GC on F2FS" am: 9604da99e1 am: feca79078e
Daniel Rosenberg [Fri, 1 Mar 2019 04:34:40 +0000 (20:34 -0800)]
Merge "Add a postinstall script for GC on F2FS" am: 9604da99e1 am: feca79078e
am: 4a27fd1bf2

Change-Id: I93c765adde0361af8f3d9c0b369486532d9329c6

5 years agoMerge "Add a postinstall script for GC on F2FS" am: 9604da99e1
Daniel Rosenberg [Fri, 1 Mar 2019 04:30:38 +0000 (20:30 -0800)]
Merge "Add a postinstall script for GC on F2FS" am: 9604da99e1
am: feca79078e

Change-Id: I561645fb6a1a0eee164b684efd9ffbf483bfe1a5

5 years agoMerge "Add a postinstall script for GC on F2FS"
Daniel Rosenberg [Fri, 1 Mar 2019 04:26:34 +0000 (20:26 -0800)]
Merge "Add a postinstall script for GC on F2FS"
am: 9604da99e1

Change-Id: I0be4cd40888937bdcb0a09ad7b737f4fd23af73a

5 years agoMerge "Add a postinstall script for GC on F2FS"
Daniel Rosenberg [Fri, 1 Mar 2019 04:16:59 +0000 (04:16 +0000)]
Merge "Add a postinstall script for GC on F2FS"

5 years agoAdd a postinstall script for GC on F2FS
Daniel Rosenberg [Thu, 14 Feb 2019 00:24:25 +0000 (16:24 -0800)]
Add a postinstall script for GC on F2FS

This script is intended to run on F2FS checkpointing devices.
It triggers garbage collection for a period of time to make
mounting with checkpoint=disable smoother.

Test: Set this script as a postinstall script on vendor
Bug: 123367711
Change-Id: I87e143a2004da5852654688c3c8773510b7073ae

5 years agoMerge "simpleperf: make app api available for profileable apps." am: c8467aa1cd am...
Yabin Cui [Thu, 28 Feb 2019 23:04:23 +0000 (15:04 -0800)]
Merge "simpleperf: make app api available for profileable apps." am: c8467aa1cd am: ce72022e9e
am: bd774752de

Change-Id: I5310eedd6c0fd5f62d4a482e5afd0d003410b68c

5 years agoMerge "simpleperf: make app api available for profileable apps." am: c8467aa1cd
Yabin Cui [Thu, 28 Feb 2019 22:54:04 +0000 (14:54 -0800)]
Merge "simpleperf: make app api available for profileable apps." am: c8467aa1cd
am: ce72022e9e

Change-Id: I845fd21fc9ffda51356a7d2c4869f7aa8dc57d41

5 years agoMerge "simpleperf: make app api available for profileable apps."
Yabin Cui [Thu, 28 Feb 2019 22:37:44 +0000 (14:37 -0800)]
Merge "simpleperf: make app api available for profileable apps."
am: c8467aa1cd

Change-Id: Ie527fdf062e84ce6bbc5c59a8630e4516478c8a3

5 years agoMerge "simpleperf: make app api available for profileable apps."
Yabin Cui [Thu, 28 Feb 2019 21:54:52 +0000 (21:54 +0000)]
Merge "simpleperf: make app api available for profileable apps."

5 years agosimpleperf: make app api available for profileable apps.
Yabin Cui [Mon, 25 Feb 2019 23:22:43 +0000 (15:22 -0800)]
simpleperf: make app api available for profileable apps.

Add api-prepare cmd to prepare recording via app api.
Add api-collect cmd to collect recording data generated by app api. The
recording data is compressed into a zip file.
The two added cmds support both debuggable apps and profileable apps.
Move api_app_profiler.py to api_profiler.py. And use the two added cmds in it.

Also improve app_api code:
1. Fix finding simpleperf.
2. Use time based output filenames.

Bug: 123717243
Test: test manually, will add run python tests later.

Change-Id: I88c20578d01a84bc20ea72276f2cab0f3c4d9109

5 years agoMerge "simpleperf: add test for a problem recording user stack." am: 549d13ff00 am...
Yabin Cui [Thu, 28 Feb 2019 19:06:29 +0000 (11:06 -0800)]
Merge "simpleperf: add test for a problem recording user stack." am: 549d13ff00 am: 459b57ac50
am: 1fca71d54b

Change-Id: I81e4ebe53d924ae364d3ba0e0281591f9a27ff72

5 years agoMerge "simpleperf: add test for a problem recording user stack." am: 549d13ff00
Yabin Cui [Thu, 28 Feb 2019 19:02:23 +0000 (11:02 -0800)]
Merge "simpleperf: add test for a problem recording user stack." am: 549d13ff00
am: 459b57ac50

Change-Id: Ia19db7759edfab694572b163d7722fd3841f9fbc

5 years agoMerge "simpleperf: add test for a problem recording user stack."
Yabin Cui [Thu, 28 Feb 2019 18:58:26 +0000 (10:58 -0800)]
Merge "simpleperf: add test for a problem recording user stack."
am: 549d13ff00

Change-Id: I45f022ad18fed5d6158e80adffdba37e796e89d1

5 years agoMerge "simpleperf: add test for a problem recording user stack."
Yabin Cui [Thu, 28 Feb 2019 18:45:55 +0000 (18:45 +0000)]
Merge "simpleperf: add test for a problem recording user stack."

5 years agoMerge "simpleperf: fix 32-bit simpleperf_unit_test." am: 12b04e5e17 am: ab1c67e5e7
Yabin Cui [Thu, 28 Feb 2019 12:46:43 +0000 (04:46 -0800)]
Merge "simpleperf: fix 32-bit simpleperf_unit_test." am: 12b04e5e17 am: ab1c67e5e7
am: a6f71f32f6

Change-Id: I09f309e7868b551d5dd2d483a30e41395020fa1b

5 years agoMerge "simpleperf: fix 32-bit simpleperf_unit_test." am: 12b04e5e17
Yabin Cui [Thu, 28 Feb 2019 12:42:40 +0000 (04:42 -0800)]
Merge "simpleperf: fix 32-bit simpleperf_unit_test." am: 12b04e5e17
am: ab1c67e5e7

Change-Id: I91d3e4e12c956e533509f3cf02db63e891a45637

5 years agoMerge "simpleperf: fix 32-bit simpleperf_unit_test."
Yabin Cui [Thu, 28 Feb 2019 12:38:38 +0000 (04:38 -0800)]
Merge "simpleperf: fix 32-bit simpleperf_unit_test."
am: 12b04e5e17

Change-Id: I7d32798b4779127258f9fdfdcea5d8f47759bbb4

5 years agoMerge "simpleperf: fix 32-bit simpleperf_unit_test."
Treehugger Robot [Thu, 28 Feb 2019 12:27:09 +0000 (12:27 +0000)]
Merge "simpleperf: fix 32-bit simpleperf_unit_test."

5 years agoRename data/pkg_staging to data/app-staging
Gavin Corkery [Wed, 27 Feb 2019 11:18:03 +0000 (11:18 +0000)]
Rename data/pkg_staging to data/app-staging

Test: n/a
Bug: 126330086

Change-Id: I73367a60c23ca17d0557253bea25279c104e1e53

5 years agoMerge "simpleperf: fix showing a misleading msg." am: 284f5b9611 am: 66d2a889bb
Yabin Cui [Thu, 28 Feb 2019 00:40:54 +0000 (16:40 -0800)]
Merge "simpleperf: fix showing a misleading msg." am: 284f5b9611 am: 66d2a889bb
am: 0b189b1583

Change-Id: I18fedac21891be110878d0bf6a2aeb470f36c242

5 years agoMerge "simpleperf: fix showing a misleading msg." am: 284f5b9611
Yabin Cui [Thu, 28 Feb 2019 00:14:59 +0000 (16:14 -0800)]
Merge "simpleperf: fix showing a misleading msg." am: 284f5b9611
am: 66d2a889bb

Change-Id: I0a5fa52b4ef65eeef4436877925f28fc92fdc1b9

5 years agoMerge "simpleperf: fix showing a misleading msg."
Yabin Cui [Thu, 28 Feb 2019 00:06:53 +0000 (16:06 -0800)]
Merge "simpleperf: fix showing a misleading msg."
am: 284f5b9611

Change-Id: Ie613a93ef83ac509f0104a87e989efe0a68bcf50

5 years agoMerge "simpleperf: fix showing a misleading msg."
Yabin Cui [Wed, 27 Feb 2019 23:44:34 +0000 (23:44 +0000)]
Merge "simpleperf: fix showing a misleading msg."

5 years agosimpleperf: fix 32-bit simpleperf_unit_test.
Yabin Cui [Wed, 27 Feb 2019 18:53:16 +0000 (10:53 -0800)]
simpleperf: fix 32-bit simpleperf_unit_test.

Previously simpleperf_unit_test links with libLLVM_android,
which doesn't have 32-bit version on device. This makes
32-bit simpleperf_unit_test fail. So switch it to static llvm
libs.

Bug: none
Test: build and run simpleperf_unit_test.
Change-Id: I23dcf647c6a7e37a8126315bf0417d4de283f05d

5 years agosimpleperf: add test for a problem recording user stack.
Yabin Cui [Wed, 27 Feb 2019 21:44:16 +0000 (13:44 -0800)]
simpleperf: add test for a problem recording user stack.

Also fix a line in another test.

Bug: 113127950
Test: run simpleperf_unit_test.
Change-Id: Id7fd20cdc441734a8d39255fecfbd8fe9021274e

5 years agosimpleperf: fix showing a misleading msg.
Yabin Cui [Wed, 27 Feb 2019 21:01:47 +0000 (13:01 -0800)]
simpleperf: fix showing a misleading msg.

Bug: none
Test: run simpleperf manually.
Test: run simpleperf_unit_test.
Change-Id: I848d6508b8acecdba3be2d2fc1ce15be4e2a368b

5 years agoMerge "libfscrypt: Do not encrypt the "gsi" folder." am: de8da60180 am: 63c62374b7
David Anderson [Wed, 27 Feb 2019 20:11:33 +0000 (12:11 -0800)]
Merge "libfscrypt: Do not encrypt the "gsi" folder." am: de8da60180 am: 63c62374b7
am: a256698132

Change-Id: Ic49d3a28f86fe61560b0562baf1690e2248caad0

5 years agoMerge "libfscrypt: Do not encrypt the "gsi" folder." am: de8da60180
David Anderson [Wed, 27 Feb 2019 20:07:12 +0000 (12:07 -0800)]
Merge "libfscrypt: Do not encrypt the "gsi" folder." am: de8da60180
am: 63c62374b7

Change-Id: I268dedba401b9944d97dcdd7fe895da4104e342a

5 years agoMerge "libfscrypt: Do not encrypt the "gsi" folder."
David Anderson [Wed, 27 Feb 2019 19:56:28 +0000 (11:56 -0800)]
Merge "libfscrypt: Do not encrypt the "gsi" folder."
am: de8da60180

Change-Id: Iaf0da57d4d0829b49f87ec57886a156b01d786f1

5 years agoMerge "libfscrypt: Do not encrypt the "gsi" folder."
David Anderson [Wed, 27 Feb 2019 19:48:14 +0000 (19:48 +0000)]
Merge "libfscrypt: Do not encrypt the "gsi" folder."

5 years agoUse unique_ptr for Maps object.
Florian Mayer [Wed, 27 Feb 2019 19:35:01 +0000 (19:35 +0000)]
Use unique_ptr for Maps object.

Change-Id: I727832857834c527c17bac532253aaac60e1b314

5 years agoMerge "Fix build error of generating fec data" am: 1efeb1d970 am: 918742ac86
Sami Tolvanen [Tue, 26 Feb 2019 16:35:27 +0000 (08:35 -0800)]
Merge "Fix build error of generating fec data" am: 1efeb1d970 am: 918742ac86
am: 66bd9398c6

Change-Id: Ie48fb0133fbb82892d0346f5b2fd712bb76bc906

5 years agoMerge "Fix build error of generating fec data" am: 1efeb1d970
Sami Tolvanen [Tue, 26 Feb 2019 16:31:12 +0000 (08:31 -0800)]
Merge "Fix build error of generating fec data" am: 1efeb1d970
am: 918742ac86

Change-Id: Id85c5ed4936d1ed7f8463b483e9e942e8ef72e6f

5 years agoMerge "Fix build error of generating fec data"
Sami Tolvanen [Tue, 26 Feb 2019 16:26:58 +0000 (08:26 -0800)]
Merge "Fix build error of generating fec data"
am: 1efeb1d970

Change-Id: I4e1bb2582335cc89785a0a668432b1e498c2f5a8

5 years agoMerge "Fix build error of generating fec data"
Sami Tolvanen [Tue, 26 Feb 2019 16:17:07 +0000 (16:17 +0000)]
Merge "Fix build error of generating fec data"

5 years agoMerge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external...
Martin Stjernholm [Tue, 26 Feb 2019 08:18:48 +0000 (00:18 -0800)]
Merge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external." am: c65e54940b am: 653e8b4615
am: ad08fc2939

Change-Id: I7941cc0cb5cc7483791829a294224ec0c201f7c0

5 years agoMerge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external...
Martin Stjernholm [Tue, 26 Feb 2019 07:29:08 +0000 (23:29 -0800)]
Merge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external." am: c65e54940b
am: 653e8b4615

Change-Id: Ia99308c3494e39b7a4bf05d14c0efa1f9c85133e

5 years agoMerge "cppreopts: remove DAC capabilities" am: f7d22c0919 am: 5cef3f8263
Jeff Vander Stoep [Tue, 26 Feb 2019 07:13:29 +0000 (23:13 -0800)]
Merge "cppreopts: remove DAC capabilities" am: f7d22c0919 am: 5cef3f8263
am: 4adf2fadde

Change-Id: Ib790c1df1aac03a0669aa9105c31b6fe10c4081d

5 years agoMerge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external."
Martin Stjernholm [Tue, 26 Feb 2019 07:09:24 +0000 (23:09 -0800)]
Merge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external."
am: c65e54940b

Change-Id: I2ecef404bfe0277f88278d2b8623d3b58b23a46b

5 years agoMerge "cppreopts: remove DAC capabilities" am: f7d22c0919
Jeff Vander Stoep [Tue, 26 Feb 2019 07:03:07 +0000 (23:03 -0800)]
Merge "cppreopts: remove DAC capabilities" am: f7d22c0919
am: 5cef3f8263

Change-Id: I8bcb4597e2debc9f7fb2ae7092d12ec3f5684d0b

5 years agoMerge "cppreopts: remove DAC capabilities"
Jeff Vander Stoep [Tue, 26 Feb 2019 06:51:41 +0000 (22:51 -0800)]
Merge "cppreopts: remove DAC capabilities"
am: f7d22c0919

Change-Id: I20f23abaaddd7e29ae8ddf9a9167928b08ad1938

5 years agoMerge "su: fix the command line syntax." am: ec993d71cf am: 0d827f3e57
Elliott Hughes [Tue, 26 Feb 2019 06:14:31 +0000 (22:14 -0800)]
Merge "su: fix the command line syntax." am: ec993d71cf am: 0d827f3e57
am: fd230bf39b

Change-Id: I4481dd39645276593b815f5481f45bb825b1491a

5 years agoMerge "su: fix the command line syntax." am: ec993d71cf
Elliott Hughes [Tue, 26 Feb 2019 06:02:12 +0000 (22:02 -0800)]
Merge "su: fix the command line syntax." am: ec993d71cf
am: 0d827f3e57

Change-Id: I02fe3f668d9d43b547ad8839b5d793c593f17c25

5 years ago[automerger skipped] Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-maste...
Xin Li [Tue, 26 Feb 2019 05:28:53 +0000 (21:28 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master am: d792a6af1a -s ours
am: 0143f90169 -s ours
am skip reason: subject contains skip directive

Change-Id: I680fe1e275d0f0054e624fb0d31d2ef84b4a2162

5 years ago[automerger skipped] Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-maste...
Xin Li [Tue, 26 Feb 2019 04:52:44 +0000 (20:52 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master
am: d792a6af1a -s ours
am skip reason: subject contains skip directive

Change-Id: I5abb890b103a6a5b880698d04c16c861c1551e6c

5 years agolibfscrypt: Do not encrypt the "gsi" folder.
David Anderson [Tue, 26 Feb 2019 00:34:24 +0000 (16:34 -0800)]
libfscrypt: Do not encrypt the "gsi" folder.

On FBE devices without metadata encryption, GSI images must not be
encrypted, since they are written using normal write() calls rather than
going through device-mapper.

Bug: 126249541
Test: GSI works on FBE device without metadata encryption
Change-Id: Ie14be778eb4a7f18dd8ea33a044ba86f909f3cce

5 years agoMerge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external."
Treehugger Robot [Mon, 25 Feb 2019 20:59:13 +0000 (20:59 +0000)]
Merge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external."

5 years agoMerge "cppreopts: remove DAC capabilities"
Treehugger Robot [Mon, 25 Feb 2019 20:21:52 +0000 (20:21 +0000)]
Merge "cppreopts: remove DAC capabilities"

5 years agocppreopts: remove DAC capabilities
Jeff Vander Stoep [Sat, 23 Feb 2019 14:08:43 +0000 (06:08 -0800)]
cppreopts: remove DAC capabilities

Define service for cppreopts.sh in order to drop DAC capabilities for
for it and its children. Capabilities were already blocked by SELinux
so this does not cause a functional change, but rather shifts the
blocking mechanism to the DAC capability check which fails less
noisily. Otherwise, this change is intended to preserve the previous
behavior and uses "exec_start" to presever the blocking behavior of
"exec".

This prevents an selinux denial which is causing occasional presubmit
failures:
avc: denied { sys_resource } for comm="preopt2cachenam" capability=24
scontext=u:r:preopt2cachename:s0 tcontext=u:r:preopt2cachename:s0
tclass=capability permissive=0

Bug: 79414024
Test: Boot a phone with the cppreopts feature. Verify no logcat errors and all
the files are copied to the location given by preopt2cachename.
Change-Id: If630b53d32c3c0414939b1f8db8d486406003567

5 years ago[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am...
Xin Li [Mon, 25 Feb 2019 16:25:07 +0000 (08:25 -0800)]
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: 97b9015991 -s ours
am: 987971bf3a -s ours
am skip reason: subject contains skip directive

Change-Id: I3f0457d503c82b054be3288a19d878b9fc088623

5 years ago[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Xin Li [Mon, 25 Feb 2019 15:25:05 +0000 (07:25 -0800)]
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 97b9015991 -s ours
am skip reason: subject contains skip directive

Change-Id: Icef4a9d79b578d4f0fe55715b16190b4f60c6a7e

5 years agoFix libdexfile dependencies to avoid direct dependency on libdexfile_external.
Martin Stjernholm [Wed, 20 Feb 2019 16:58:42 +0000 (16:58 +0000)]
Fix libdexfile dependencies to avoid direct dependency on libdexfile_external.

It should be dlopen'ed lazily by libdexfile_support now.

Test: mmma system/extras/simpleperf
Test: atest simpleperf_unit_test
  (1 failure in cpu_offline test, but that happens even without this CL)
Bug: 124827589
Bug: 123186083
Change-Id: Ibeb37b130f0081965b986622794f60ec75cd2e17

5 years agoFix build error of generating fec data
Jinguang Dong [Sat, 23 Feb 2019 04:14:36 +0000 (12:14 +0800)]
Fix build error of generating fec data

When we make the fec data for spare images, we will check each
chunk the length of spare image but not the total length.
If the libspare sends the data which is not a multiple of 4096,
there is an error.

We have reproduced it using our image.

The data is send by
https://android.googlesource.com/platform/system/core/+/fca4a9c27950a4a4281de0f413280cff9f4da653/libsparse/output_file.cpp#272

, and is checked by
https://android.googlesource.com/platform/system/extras/+/29bf737e56e10c2742f1e14fe9f07184d59bbcc0/verity/fec/image.cpp#179

If the to_write in first link is equal INT_MAX, the assert in second
link will be failed.

Test: use fec to product fec data successfully
      ./fec --encode --roots 2 system.img fecdata

Change-Id: Ib1e310a32bcda8acb3785d3784537d84fd439732

5 years agoMerge "su: fix the command line syntax."
Elliott Hughes [Sat, 23 Feb 2019 05:19:05 +0000 (21:19 -0800)]
Merge "su: fix the command line syntax."
am: ec993d71cf

Change-Id: I560b5f1ef15cd2a0cccdfe30bd8ace1cf83bc2c5

5 years agoMerge "su: fix the command line syntax."
Elliott Hughes [Sat, 23 Feb 2019 05:10:40 +0000 (05:10 +0000)]
Merge "su: fix the command line syntax."

5 years agoAdd dump of long monitor contention
Keun-young Park [Thu, 21 Feb 2019 04:01:32 +0000 (20:01 -0800)]
Add dump of long monitor contention

- Long monitor contention during boot up affects boot up performance.
- Dump long monitor contention over 100ms.

Bug: 124950798
Test: python system/extras/boottime_tools/bootanalyze/bootanalyze.py -c system/extras/boottime_tools/bootanalyze/config.yaml -n 10 -r -t
Change-Id: I22cc7bc3d19f53acb8e213d9155f6f2390292d92

5 years agoMerge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp...
Xin Li [Thu, 21 Feb 2019 07:04:38 +0000 (07:04 +0000)]
Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master

5 years agosu: fix the command line syntax.
Elliott Hughes [Thu, 21 Feb 2019 06:38:23 +0000 (22:38 -0800)]
su: fix the command line syntax.

Test: `su --help`
Change-Id: I08f2e897b6d472f1748574aa162555ac8adfc05e

5 years agoMerge "simpleperf: add api_app_profiler.py." am: 5e64dcd02e am: faf723af39
Yabin Cui [Thu, 21 Feb 2019 01:34:06 +0000 (17:34 -0800)]
Merge "simpleperf: add api_app_profiler.py." am: 5e64dcd02e am: faf723af39
am: d10b469dec

Change-Id: Ib8b918978bc6cac7b23e5117fe1b4fe24b6a2d4b

5 years agoMerge "simpleperf: Add Java/C++ API to control simpleperf in app code." am: d3eccf50e...
Yabin Cui [Thu, 21 Feb 2019 01:33:49 +0000 (17:33 -0800)]
Merge "simpleperf: Add Java/C++ API to control simpleperf in app code." am: d3eccf50e8 am: 9a1e2f07ce
am: a93bf1942f

Change-Id: I9a7cca075df9318305e6a25b803338e5da71ed67

5 years agoMerge "simpleperf: add api_app_profiler.py." am: 5e64dcd02e
Yabin Cui [Thu, 21 Feb 2019 01:15:50 +0000 (17:15 -0800)]
Merge "simpleperf: add api_app_profiler.py." am: 5e64dcd02e
am: faf723af39

Change-Id: I82d7d711129b5d0c33aee4c7eb9c2180f3cd3404

5 years agoMerge "simpleperf: Add Java/C++ API to control simpleperf in app code." am: d3eccf50e8
Yabin Cui [Thu, 21 Feb 2019 01:15:33 +0000 (17:15 -0800)]
Merge "simpleperf: Add Java/C++ API to control simpleperf in app code." am: d3eccf50e8
am: 9a1e2f07ce

Change-Id: I64e508a207bdce9601419a2b65083a2f174b7c7a

5 years agoMerge "simpleperf: add api_app_profiler.py."
Yabin Cui [Thu, 21 Feb 2019 01:02:05 +0000 (17:02 -0800)]
Merge "simpleperf: add api_app_profiler.py."
am: 5e64dcd02e

Change-Id: I7aeb0bc7329a208c651083d88357716f18c346c0

5 years agoMerge "simpleperf: Add Java/C++ API to control simpleperf in app code."
Yabin Cui [Thu, 21 Feb 2019 01:01:53 +0000 (17:01 -0800)]
Merge "simpleperf: Add Java/C++ API to control simpleperf in app code."
am: d3eccf50e8

Change-Id: Ia3de5ebc24db32ef2781bcbaf113f5aad3d38b60

5 years agoMerge "simpleperf: add api_app_profiler.py."
Yabin Cui [Thu, 21 Feb 2019 00:48:17 +0000 (00:48 +0000)]
Merge "simpleperf: add api_app_profiler.py."

5 years agoMerge "simpleperf: Add Java/C++ API to control simpleperf in app code."
Yabin Cui [Thu, 21 Feb 2019 00:48:17 +0000 (00:48 +0000)]
Merge "simpleperf: Add Java/C++ API to control simpleperf in app code."

5 years agoDO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Xin Li [Thu, 21 Feb 2019 00:20:08 +0000 (16:20 -0800)]
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I99cfd48e17ee28ee0d644aed0f11b71fb14277c0

5 years agoMerge changes from topic "libprocessgroup_json" am: 9a406fb9b0 am: 049d6b4b7b
Yifan Hong [Wed, 20 Feb 2019 23:18:50 +0000 (15:18 -0800)]
Merge changes from topic "libprocessgroup_json" am: 9a406fb9b0 am: 049d6b4b7b
am: af6d32c43d

Change-Id: I71df758a2cf7f9310459311b5e41f6a2a382c037

5 years agoMerge changes from topic "libprocessgroup_json" am: 9a406fb9b0
Yifan Hong [Wed, 20 Feb 2019 22:58:21 +0000 (14:58 -0800)]
Merge changes from topic "libprocessgroup_json" am: 9a406fb9b0
am: 049d6b4b7b

Change-Id: Ib29b3ada01b6fdc293ed154ed52f019bee8ad4f7

5 years agoMerge changes from topic "libprocessgroup_json"
Yifan Hong [Wed, 20 Feb 2019 22:05:30 +0000 (14:05 -0800)]
Merge changes from topic "libprocessgroup_json"
am: 9a406fb9b0

Change-Id: I2affe1b197438dfbaff380bd2924e0a3fa3e7d6c

5 years agosimpleperf: add api_app_profiler.py.
Yabin Cui [Fri, 15 Feb 2019 00:56:37 +0000 (16:56 -0800)]
simpleperf: add api_app_profiler.py.

It is used to help the API controlling simpleperf in app code.

Bug: 123717243
Test: run api_app_profiler.py to help profile app CppApi and JavaApi.
Change-Id: I1ada2ad9fbf040816db999632f4300c496c63a58

5 years agosimpleperf: Add Java/C++ API to control simpleperf in app code.
Yabin Cui [Fri, 15 Feb 2019 00:23:05 +0000 (16:23 -0800)]
simpleperf: Add Java/C++ API to control simpleperf in app code.

Also add JavaApi app to test the Java API, and CppApi App to test
the C++ API.
Also expose help msgs for options used in the API.

Bug: 123717243
Test: run apps manually and verify the generated profiling data.
Change-Id: I64c9de82b3f7eb3d76c6aff0703e12ce33233e49

5 years agoMerge "Rename /data/staging to /data/pkg_staging." am: c45961b146 am: 54bb992148
Dario Freni [Wed, 20 Feb 2019 20:38:53 +0000 (12:38 -0800)]
Merge "Rename /data/staging to /data/pkg_staging." am: c45961b146 am: 54bb992148
am: ab35f1a7d7

Change-Id: Idf93456829decc06921cce6231d6867046de3ae6

5 years agoMerge changes from topic "libprocessgroup_json"
Yifan Hong [Wed, 20 Feb 2019 20:35:47 +0000 (20:35 +0000)]
Merge changes from topic "libprocessgroup_json"

* changes:
  Add libjsonpbverify.
  Add libjsonpbparse.

5 years agoMerge "Rename /data/staging to /data/pkg_staging." am: c45961b146
Dario Freni [Wed, 20 Feb 2019 20:06:47 +0000 (12:06 -0800)]
Merge "Rename /data/staging to /data/pkg_staging." am: c45961b146
am: 54bb992148

Change-Id: I5880a70ba17e860fd17a1b9943a537e8b576825f

5 years agoMerge "Rename /data/staging to /data/pkg_staging."
Dario Freni [Wed, 20 Feb 2019 19:30:54 +0000 (11:30 -0800)]
Merge "Rename /data/staging to /data/pkg_staging."
am: c45961b146

Change-Id: I774ac98004a2e10bf5cf0cdc7a831429f121bae4

5 years agoMerge "Rename /data/staging to /data/pkg_staging."
Treehugger Robot [Wed, 20 Feb 2019 16:33:20 +0000 (16:33 +0000)]
Merge "Rename /data/staging to /data/pkg_staging."