Greg Kaiser
6fd9460002
Merge "Revert "Remove unused String8::setPathName."" am: 615bf4ef14
am: 01f3306b69
am: 2cca5cc992
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1768145
Change-Id: I9eb161676ecb73ba75d08b7d49b8305bf12455ab
2021-07-15 14:10:31 +00:00
Greg Kaiser
2cca5cc992
Merge "Revert "Remove unused String8::setPathName."" am: 615bf4ef14
am: 01f3306b69
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1768145
Change-Id: I9856b917353e57b048eeec2d3ed6d157165e1148
2021-07-15 13:56:01 +00:00
Greg Kaiser
01f3306b69
Merge "Revert "Remove unused String8::setPathName."" am: 615bf4ef14
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1768145
Change-Id: Ia4e7c9d015865964a87ab525c2c6f7105ea02b1f
2021-07-15 13:46:08 +00:00
Greg Kaiser
615bf4ef14
Merge "Revert "Remove unused String8::setPathName.""
2021-07-15 13:33:54 +00:00
Greg Kaiser
70d9fb63e6
Revert "Remove unused String8::setPathName."
...
This reverts commit c214426e0c
.
Reason for revert: This is not unused; broke build internally
Change-Id: I18e8b7954256ae015ad32743fa6a75850b00913e
2021-07-15 13:33:10 +00:00
Treehugger Robot
606ba34bf6
Merge "Revert "Re-land removing RECOVERY_AS_BOOT check for init_first_stage"" am: d939aa2405
am: eafdcd0b27
am: a7ac810749
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1765788
Change-Id: I6997f1b259fbad7f7ec2a4ccf11e371c606a6f08
2021-07-15 09:32:03 +00:00
David Anderson
e82ea21f1c
Merge "libsnapshot: Fix inconsistency in how merge ops are counted." am: 16aa3c9573
am: b0b9d35d2a
am: 25c301c8a3
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1767246
Change-Id: If83e5d88d7d3742e832c77e7452463721cdc8c56
2021-07-15 09:29:42 +00:00
Treehugger Robot
a7ac810749
Merge "Revert "Re-land removing RECOVERY_AS_BOOT check for init_first_stage"" am: d939aa2405
am: eafdcd0b27
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1765788
Change-Id: I0b54cb36881d6e31233d83e4a81e0aab04a41fa8
2021-07-15 09:29:40 +00:00
Treehugger Robot
eafdcd0b27
Merge "Revert "Re-land removing RECOVERY_AS_BOOT check for init_first_stage"" am: d939aa2405
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1765788
Change-Id: Ia948bc1aa191c5170536b6c865699cab5a39fab6
2021-07-15 09:03:15 +00:00
David Anderson
25c301c8a3
Merge "libsnapshot: Fix inconsistency in how merge ops are counted." am: 16aa3c9573
am: b0b9d35d2a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1767246
Change-Id: Iefb3c946a6ef3b54357e1aadddbe3627f9ffdf11
2021-07-15 09:01:50 +00:00
Treehugger Robot
d939aa2405
Merge "Revert "Re-land removing RECOVERY_AS_BOOT check for init_first_stage""
2021-07-15 05:38:21 +00:00
David Anderson
b0b9d35d2a
Merge "libsnapshot: Fix inconsistency in how merge ops are counted." am: 16aa3c9573
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1767246
Change-Id: I073d1478291d824c83e51f7f5f838e2a8c03c3ee
2021-07-15 01:52:10 +00:00
David Anderson
16aa3c9573
Merge "libsnapshot: Fix inconsistency in how merge ops are counted."
2021-07-15 01:00:33 +00:00
David Anderson
0f707941d4
libsnapshot: Fix inconsistency in how merge ops are counted.
...
A recent change to libsnapshot caused us to filter out duplicate COW
ops. The merge consistency check relied on the old method of manually
counting ops, causing it to come up with a different number. Fix this by
using the already computed "official" count.
Bug: 193532829
Test: new test case in vts_libsnapshot_test
manual test with incremental OTA
Change-Id: I68d1e41f5c140af20a04ba80e3db0780a916ecf8
2021-07-14 16:44:54 -07:00
Elliott Hughes
5c5854a383
Merge "Remove unused String8::setPathName." am: 40a0664b84
am: 5f7d548dc6
am: 941b1a61b0
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1765465
Change-Id: I2fcc66e3bf09f9b317c32833df03cd3950ce74ce
2021-07-14 22:04:17 +00:00
Elliott Hughes
941b1a61b0
Merge "Remove unused String8::setPathName." am: 40a0664b84
am: 5f7d548dc6
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1765465
Change-Id: If7b66e7de22107110fa595827611f1bb1a83a9dc
2021-07-14 21:48:06 +00:00
Elliott Hughes
5f7d548dc6
Merge "Remove unused String8::setPathName." am: 40a0664b84
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1765465
Change-Id: I0e97d07a522f6041beb1a4bfdc66123b7e25511d
2021-07-14 21:31:19 +00:00
Elliott Hughes
40a0664b84
Merge "Remove unused String8::setPathName."
2021-07-14 21:20:24 +00:00
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
Bowgo Tsai
ab079af28f
Revert "Re-land removing RECOVERY_AS_BOOT check for init_first_stage"
...
This reverts commit 4818f74888
.
The previous commit might introduce a build break on legacy
devices that with a smaller /boot partition size, because it
outputs the first-stage init and the second-stage init binaries
in the following locations, respectively (when
BOARD_USES_RECOVERY_AS_BOOT is true).
* $OUT/recovery/root/first_stage_ramdisk/init
* $OUT/recovery/root/system/bin/init
The first one is not needed because there is already a symlink
under $OUT/recovery/root: init -> /system/bin/init.
Bug: 193565271
Test: `lunch aosp_flame-userdebug`, `make bootimage_debug` then
checks the output under $OUT/debug_ramdisk/.
Test: Performs the same check for `lunch aosp_bramble-userdebug`.
Change-Id: I6277a6c4c0980bd976cc35db6ca99eafc6bf3f5a
2021-07-14 19:21:40 +08:00
Elliott Hughes
c214426e0c
Remove unused String8::setPathName.
...
Test: treehugger
Change-Id: Idc8d7e748b0df4ce8a26227dc73a5eef2b04244f
2021-07-13 17:20:53 -07: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