Andrew Walbran
3a0f835059
Merge "virtualizationservice will clear its own temporary directory." am: 1ed24f477e
am: ea969ebe7d
am: b63e339314
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1765972
Change-Id: I2e73b28bff3ea115dc4b7109a13d81adc97c6ef6
2021-07-14 19:31:54 +00:00
Andrew Walbran
b63e339314
Merge "virtualizationservice will clear its own temporary directory." am: 1ed24f477e
am: ea969ebe7d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1765972
Change-Id: Ic9ad3fbba77efac2d414176628039c49f0b6d1be
2021-07-14 19:07:34 +00:00
Andrew Walbran
ea969ebe7d
Merge "virtualizationservice will clear its own temporary directory." am: 1ed24f477e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1765972
Change-Id: I2472688ff40a39b2d008f3046e9fcab70f696318
2021-07-14 18:43:54 +00:00
Andrew Walbran
1ed24f477e
Merge "virtualizationservice will clear its own temporary directory."
2021-07-14 18:29:04 +00:00
Seth Moore
1d3eea09b0
[automerger skipped] Merge "Client side implementation of Trusty IRPC HAL" am: 8fe5602099
am: b3cae813c5
-s ours am: 6f131ea404
-s ours
...
am skip reason: Merged-In I32c30ce2dc44e95ff91574ce405f10e3b5dc9699 with SHA-1 5ac2c87c7a
is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1756551
Change-Id: I1b3ae75723cb1a6e7d5fb5e9e8ac6f13774ae6c2
2021-07-14 17:32:15 +00:00
Seth Moore
6f131ea404
[automerger skipped] Merge "Client side implementation of Trusty IRPC HAL" am: 8fe5602099
am: b3cae813c5
-s ours
...
am skip reason: Merged-In I32c30ce2dc44e95ff91574ce405f10e3b5dc9699 with SHA-1 5ac2c87c7a
is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1756551
Change-Id: I0286e8d78284de1fdc943816de979851d95e2c62
2021-07-14 17:13:54 +00:00
Seth Moore
b3cae813c5
Merge "Client side implementation of Trusty IRPC HAL" am: 8fe5602099
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1756551
Change-Id: I6e6032b0d8f61554cdef19c699c2102149ae2218
2021-07-14 16:56:09 +00:00
Seth Moore
8fe5602099
Merge "Client side implementation of Trusty IRPC HAL"
2021-07-14 16:35:37 +00:00
Andrew Walbran
1f885aee3d
virtualizationservice will clear its own temporary directory.
...
Bug: 192917795
Bug: 193365943
Test: flashed on a VIM3L and booted
Change-Id: Ib9657843c4d13c428670982a3f8d0e5dfdb78211
2021-07-14 14:18:25 +00:00
Tri Vo
e73f4f6828
Merge "trusty: Increase timeout for ConfirmationUI fuzzer" am: e3ec5f9363
am: a1a4b281c9
am: 879dd3f8f3
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1763600
Change-Id: Idff28cb78da95b46b7970bc223314328ab6ffc37
2021-07-13 21:50:30 +00:00
Tri Vo
879dd3f8f3
Merge "trusty: Increase timeout for ConfirmationUI fuzzer" am: e3ec5f9363
am: a1a4b281c9
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1763600
Change-Id: I50520e613c5048af7a4f327abeb7260eede9f313
2021-07-13 21:40:14 +00:00
Tri Vo
a1a4b281c9
Merge "trusty: Increase timeout for ConfirmationUI fuzzer" am: e3ec5f9363
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1763600
Change-Id: I4f26a8fce579ab5c7a1ddeb66f28fdc72dd89b11
2021-07-13 21:24:22 +00:00
Tri Vo
e3ec5f9363
Merge "trusty: Increase timeout for ConfirmationUI fuzzer"
2021-07-13 21:09:38 +00:00
Treehugger Robot
fa3daea696
Merge "task_profiles.json: add taskprofile for dex2oat boot_complete policy" am: a7e63d9952
am: cef0bb17c2
am: 380d757bfc
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1763728
Change-Id: Ia74f1898bd61e8c6612b31a6d9c26fa0f7554ce4
2021-07-13 13:05:31 +00:00
Treehugger Robot
380d757bfc
Merge "task_profiles.json: add taskprofile for dex2oat boot_complete policy" am: a7e63d9952
am: cef0bb17c2
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1763728
Change-Id: Iafca20126d577cc765d653ee7f0f7c64e5548624
2021-07-13 12:50:53 +00:00
Treehugger Robot
cef0bb17c2
Merge "task_profiles.json: add taskprofile for dex2oat boot_complete policy" am: a7e63d9952
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1763728
Change-Id: I7835320db4f5ac7a819b2df4ef4d7416bf627118
2021-07-13 12:36:04 +00:00
Treehugger Robot
a7e63d9952
Merge "task_profiles.json: add taskprofile for dex2oat boot_complete policy"
2021-07-13 12:22:58 +00:00
Treehugger Robot
b14509ec49
Merge "fs_mgr: License boilerplate" am: df72c168d3
am: adabd1cdad
am: b5f070587b
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1749683
Change-Id: Ib15220fba32b39497ec56f8e668ed154239b31f2
2021-07-13 02:18:53 +00:00
Treehugger Robot
d5d9641030
Merge "Re-land removing RECOVERY_AS_BOOT check for init_first_stage" am: 662729bc2e
am: 852981c0c3
am: 8df4eb971e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1762146
Change-Id: I71d129f61a4c448394310ae37141c5d01e9f793f
2021-07-13 02:18:36 +00:00
Treehugger Robot
b5f070587b
Merge "fs_mgr: License boilerplate" am: df72c168d3
am: adabd1cdad
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1749683
Change-Id: Idf8bfd2a0a1367f62146bf298a18dbba48937d0a
2021-07-13 02:01:27 +00:00
Treehugger Robot
8df4eb971e
Merge "Re-land removing RECOVERY_AS_BOOT check for init_first_stage" am: 662729bc2e
am: 852981c0c3
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1762146
Change-Id: Id70e6e4bf858e026e6d88ff9fc8e05f274126b67
2021-07-13 02:01:07 +00:00
Wei Wang
814673ace3
task_profiles.json: add taskprofile for dex2oat boot_complete policy
...
Since installation time is also critical and sometime we want a finer
control on its behavior for vendor. Instead of set dex2oat to background
group, add a new task profile.
The default policy is to mirror SP_BACKGROUND to be compatible with
legacy devices.
Test: Boot
Bug: 188947181
Signed-off-by: Wei Wang <wvw@google.com>
Change-Id: I7d5e113d1c368205f712eadad27775de226131ce
(cherry picked from commit 3745ce7aa8
)
2021-07-12 18:49:52 -07:00
Treehugger Robot
adabd1cdad
Merge "fs_mgr: License boilerplate" am: df72c168d3
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1749683
Change-Id: I4f9bed425a4ac74cacfe8b46250a2e2924401c72
2021-07-13 01:47:37 +00:00
Treehugger Robot
852981c0c3
Merge "Re-land removing RECOVERY_AS_BOOT check for init_first_stage" am: 662729bc2e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1762146
Change-Id: I55d9f6b583b635aef4699a1ed5926a09f89b3f03
2021-07-13 01:47:19 +00:00
Treehugger Robot
df72c168d3
Merge "fs_mgr: License boilerplate"
2021-07-13 01:33:43 +00:00
Treehugger Robot
662729bc2e
Merge "Re-land removing RECOVERY_AS_BOOT check for init_first_stage"
2021-07-13 01:32:21 +00:00
Tri Vo
f9cfeac49e
trusty: Increase timeout for ConfirmationUI fuzzer
...
Bug: 192923547
Test: trusty_confirmationui_msg_fuzzer
Change-Id: I72755b0a35bbc3f2540672ca53acd14b1add38cb
2021-07-12 16:34:01 -07:00
TreeHugger Robot
a5a42c6e86
Merge "task_profiles.json: add taskprofile for dex2oat boot_complete policy" into sc-dev am: db4a23996d
am: ada54f5416
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15235547
Change-Id: I89b6f777feed14281ab58a2a8dc26c0ae371ee6f
2021-07-12 19:24:47 +00:00
TreeHugger Robot
60e453c520
Merge "task_profiles.json: add taskprofile for dex2oat boot_complete policy" into sc-dev am: db4a23996d
am: 107a267546
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15235547
Change-Id: If42b7698c0403c804d129cdeaefb574f8c599acd
2021-07-12 19:24:32 +00:00
TreeHugger Robot
107a267546
Merge "task_profiles.json: add taskprofile for dex2oat boot_complete policy" into sc-dev am: db4a23996d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15235547
Change-Id: I3c828ec789973c07e80bcc22bc0894955ba761e1
2021-07-12 19:08:52 +00:00
TreeHugger Robot
ada54f5416
Merge "task_profiles.json: add taskprofile for dex2oat boot_complete policy" into sc-dev am: db4a23996d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15235547
Change-Id: I15cc2c786140f42c52b36bf5406eac1052df0ed1
2021-07-12 19:07:57 +00:00
TreeHugger Robot
db4a23996d
Merge "task_profiles.json: add taskprofile for dex2oat boot_complete policy" into sc-dev
2021-07-12 18:51:11 +00:00
Inseob Kim
4818f74888
Re-land removing RECOVERY_AS_BOOT check for init_first_stage
...
This has kept adb_debug.prop from being installed for
legacy devices with BOARD_USES_RECOVERY_AS_BOOT set to
true.
Bug: 192432810
Bug: 193291885
Test: `lunch aosp_flame-userdebug` and checks `get_build_var
BOARD_USES_RECOVERY_AS_BOOT` is true.
Test: `make bootimage_debug` then checks
$OUT/debug_ramdisk/adb_debug.prop exists
Test: build/soong/build_test.bash --dist --incremental
Change-Id: I28e2c082512791407167b610843f18731ed6d673
2021-07-10 23:42:53 +08:00
Nikita Ioffe
68784a501f
[automerger skipped] Merge "Add CreateEmptyDevice and WaitForDevice APIs" into sc-v2-dev am: 83295cf46b
-s ours
...
am skip reason: Merged-In I4dfa14e5271a6a13de6da73ec3c7efb1ebc0f8b8 with SHA-1 15e0f5a98a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15221899
Change-Id: If14b81da5064a7d7a4bbf03770883dfd7126735a
2021-07-09 11:48:05 +00:00
Nikita Ioffe
83295cf46b
Merge "Add CreateEmptyDevice and WaitForDevice APIs" into sc-v2-dev
2021-07-09 11:32:55 +00:00
Bowgo Tsai
a8c6b9d27f
fs_mgr: License boilerplate
...
Bug: 191507548
Test: TreeHugger
Change-Id: I2924d1733fc64de69681971ab42a526dc3bbcc1d
2021-07-09 06:24:04 +00:00
Treehugger Robot
41b8a26e74
Merge changes I70c174c4,Ifc365e3b am: 1f92dc1a07
am: 086e31510d
am: 3f457fcda4
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1760905
Change-Id: I247633ef3e29ab4d932b1a530e1227f178207642
2021-07-08 22:03:10 +00:00
Treehugger Robot
3f457fcda4
Merge changes I70c174c4,Ifc365e3b am: 1f92dc1a07
am: 086e31510d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1760905
Change-Id: I467f47e71d01e4f5769338e73a477982ec066aad
2021-07-08 21:55:02 +00:00
Treehugger Robot
086e31510d
Merge changes I70c174c4,Ifc365e3b am: 1f92dc1a07
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1760905
Change-Id: Ia9af1a6e1331c65d20433105221d7793dd13f533
2021-07-08 21:40:03 +00:00
Treehugger Robot
1f92dc1a07
Merge changes I70c174c4,Ifc365e3b
...
* changes:
Correctly implement a stub for ICowWriter::AddXorBlocks
Add MockSnapshotWriter
2021-07-08 21:28:08 +00:00
Devin Moore
9358f8b24f
[automerger skipped] init: remove extra space in list of bootconfig values am: 91ef4dacce
am: 1802ec72cf
-s ours
...
am skip reason: Merged-In Iccdec451f53330162fa2c9ad2b7c2630f32b4168 with SHA-1 91ef4dacce
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15236059
Change-Id: I0482e4c2446d8814c270eeb4c4e681e155d444cf
2021-07-08 21:12:20 +00:00
Devin Moore
6a8eda1504
[automerger skipped] init: remove extra space in list of bootconfig values am: 91ef4dacce
-s ours am: 5f40df8267
-s ours
...
am skip reason: Merged-In Iccdec451f53330162fa2c9ad2b7c2630f32b4168 with SHA-1 6d5445b9f4
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15236059
Change-Id: I9c2c3b820fef36646c51e0a6d0e22bf8524edb92
2021-07-08 21:03:50 +00:00
Devin Moore
1802ec72cf
init: remove extra space in list of bootconfig values am: 91ef4dacce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15236059
Change-Id: I0b9bb90c1426b377cef424dc3c7a9e664a6d9863
2021-07-08 20:56:23 +00:00
Devin Moore
5f40df8267
[automerger skipped] init: remove extra space in list of bootconfig values am: 91ef4dacce
-s ours
...
am skip reason: Merged-In Iccdec451f53330162fa2c9ad2b7c2630f32b4168 with SHA-1 6d5445b9f4
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15236059
Change-Id: I97b910d1718230e290da701d485dd945b5cd054d
2021-07-08 20:54:13 +00:00
Kelvin Zhang
c801d5b8f0
Correctly implement a stub for ICowWriter::AddXorBlocks
...
Test: th
Change-Id: I70c174c4d44ef979993063256e3eededf18bd086
2021-07-08 16:12:16 -04:00
Kelvin Zhang
e475852cf6
Add MockSnapshotWriter
...
Test: th
Change-Id: Ifc365e3bafc07f0708d9e2113afa434d73f32e28
2021-07-08 16:11:16 -04:00
Wei Wang
3745ce7aa8
task_profiles.json: add taskprofile for dex2oat boot_complete policy
...
Since installation time is also critical and sometime we want a finer
control on its behavior for vendor. Instead of set dex2oat to background
group, add a new task profile.
The default policy is to mirror SP_BACKGROUND to be compatible with
legacy devices.
Test: Boot
Bug: 188947181
Signed-off-by: Wei Wang <wvw@google.com>
Change-Id: I7d5e113d1c368205f712eadad27775de226131ce
2021-07-08 11:00:02 -07:00
Devin Moore
91ef4dacce
init: remove extra space in list of bootconfig values
...
If a bootconfig argument has a list of values, it has a space between
them in /proc/bootconfig.
Example:
BOARD_BOOTCONFIG := parameter=value1,value2,value3
In /proc/bootconfig, it looks like:
parameter = "value1", "value2", "value3"
Before this CL, that example would end up with the value string of:
"value1, value2, value3"
To keep consistent behavior with kernel cmdline the value string should be:
"value1,value2,value3"
Test: Boot cuttlefish with test bootconfig params and verify ro.boot.*
Bug: 192257482
Merged-In: Iccdec451f53330162fa2c9ad2b7c2630f32b4168
Change-Id: Iccdec451f53330162fa2c9ad2b7c2630f32b4168
2021-07-08 16:53:59 +00:00
Devin Moore
d401f33b28
Merge "init: remove extra space in list of bootconfig values" am: 53ad66f41b
am: 706013153c
am: b278c3ab62
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1757971
Change-Id: I6fb90b5d21af368b8a9c014cb79180a79c99a684
2021-07-08 16:33:32 +00:00
Treehugger Robot
cbae90ad89
Merge "init: Enable hwasan error reporting." am: 905ef0e025
am: 12afdda04a
am: 2fba3bfa75
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1758940
Change-Id: I986b62e14ff11869b5ec13866cfc4df96a966d57
2021-07-08 16:33:27 +00:00