Commit graph

84484 commits

Author SHA1 Message Date
Keith Mok
a8d9426096 Merge "Adding force_flash functionality" into main am: eb2165079a am: c5e5e488b8 am: 27e7f6d601
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2700958

Change-Id: I58dd24f0f5a8ff747bae949910d28bb6da06d096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 21:56:29 +00:00
Daniel Zheng
312ccc02f4 Merge "decompressor maintenence" into main am: 86f037c245 am: 76a163f279 am: 9c2e66ee5a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2699453

Change-Id: Iafd85c9123b959b7eef2048331f2fb8a447ab120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 21:56:07 +00:00
Daniel Zheng
253944ff65 Merge "Moving includes" into main am: dc3c5292c7 am: 0789550612 am: fb1e0e7f9f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2697600

Change-Id: I15b2ae126ac6b0b0a0435ecb0e739d26a70b3b4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 21:55:56 +00:00
Daniel Zheng
c850fcc7b6 Merge "libsnapshot: take in compression_level" into main am: 73846d68cf am: 50cc4a61c4 am: 5580fe71f5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2692962

Change-Id: If5c78e42d1e4274c3bb7c3cbd3741f50a6e90c4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 21:55:03 +00:00
Keith Mok
27e7f6d601 Merge "Adding force_flash functionality" into main am: eb2165079a am: c5e5e488b8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2700958

Change-Id: I15d01e0bc2e95761f21a38107a17e104e9be02aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 21:13:55 +00:00
Daniel Zheng
9c2e66ee5a Merge "decompressor maintenence" into main am: 86f037c245 am: 76a163f279
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2699453

Change-Id: I6c4eff9bfa53b2e88f308f3a5b0a108d297748ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 21:13:44 +00:00
Daniel Zheng
fb1e0e7f9f Merge "Moving includes" into main am: dc3c5292c7 am: 0789550612
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2697600

Change-Id: I28a0d387a22defd2847a8def71f5c1379249f375
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 21:13:32 +00:00
Daniel Zheng
5580fe71f5 Merge "libsnapshot: take in compression_level" into main am: 73846d68cf am: 50cc4a61c4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2692962

Change-Id: Ie6cb6bc76337c2568357a290f64e0d23f9fb25cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 21:13:06 +00:00
Keith Mok
c5e5e488b8 Merge "Adding force_flash functionality" into main am: eb2165079a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2700958

Change-Id: I1835f087e3724654806c0ac0cbe6ee6d005177dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 20:51:43 +00:00
Daniel Zheng
76a163f279 Merge "decompressor maintenence" into main am: 86f037c245
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2699453

Change-Id: Id59be4eb265d33cf66ea756031e2b50eddd99ac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 20:50:58 +00:00
Daniel Zheng
0789550612 Merge "Moving includes" into main am: dc3c5292c7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2697600

Change-Id: I8dcb1f2f357fb9c708abb64e799e72d20e2dfc66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 20:49:40 +00:00
Keith Mok
eb2165079a Merge "Adding force_flash functionality" into main 2023-08-09 20:45:24 +00:00
Daniel Zheng
50cc4a61c4 Merge "libsnapshot: take in compression_level" into main am: 73846d68cf
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2692962

Change-Id: I9fe1f805dd5c380a5f647a5ed2e2e632cf6a0f3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 20:28:16 +00:00
Daniel Zheng
cb6d8ec07b Merge "Adding flag to flash only static partitions" into main am: 720007ba43 am: 727f70145a am: 428432bba0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2662999

Change-Id: I84860811d57532afa98384ba7ccaa64b6a7209b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 20:27:22 +00:00
Daniel Zheng
86f037c245 Merge "decompressor maintenence" into main 2023-08-09 20:04:07 +00:00
Daniel Zheng
dc3c5292c7 Merge "Moving includes" into main 2023-08-09 20:04:00 +00:00
Daniel Zheng
73846d68cf Merge "libsnapshot: take in compression_level" into main 2023-08-09 20:03:44 +00:00
Daniel Zheng
428432bba0 Merge "Adding flag to flash only static partitions" into main am: 720007ba43 am: 727f70145a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2662999

Change-Id: Ia73ec68d73db05c54fc2603f0543c9504ef2be6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 19:43:42 +00:00
Treehugger Robot
9a04ae3aa2 Merge "Remove sub-includes from libcutils/threads.h" into main am: a981d58972 am: bf51390ab1 am: 40cff3af32
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2675702

Change-Id: I0f14ca612517ead6dfa715c47a25ed78c2dd7ba0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 18:56:57 +00:00
Daniel Zheng
727f70145a Merge "Adding flag to flash only static partitions" into main am: 720007ba43
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2662999

Change-Id: Ic5d28eb01ab6fa311d264eb3b354ebe56e404454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 18:55:37 +00:00
Treehugger Robot
40cff3af32 Merge "Remove sub-includes from libcutils/threads.h" into main am: a981d58972 am: bf51390ab1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2675702

Change-Id: I23bfd658aeab7ec3650b480d39bbb16f7d344715
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 18:13:22 +00:00
Daniel Zheng
720007ba43 Merge "Adding flag to flash only static partitions" into main 2023-08-09 18:09:00 +00:00
Daniel Zheng
376b70423d Adding force_flash functionality
aosp/2452605 might've accidentally omitted force flash functionality
from fastboot. Some users need to flash dynamic partitions from
bootloader, so we are readding this feature back into fastboot

Test: adb reboot bootloader, fastboot flash system --force

Change-Id: I37a51ebbe38b27ed428c38068d30c0febd7db09c
2023-08-09 10:54:14 -07:00
Treehugger Robot
bf51390ab1 Merge "Remove sub-includes from libcutils/threads.h" into main am: a981d58972
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2675702

Change-Id: I68ba5ace85f7c0a6a6232ece57364049d194f7a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 17:26:56 +00:00
Treehugger Robot
a981d58972 Merge "Remove sub-includes from libcutils/threads.h" into main 2023-08-09 16:43:32 +00:00
Treehugger Robot
bcdfb8e89d Merge "snapuserd: Remove host_supported from snapuserd_test until it passes." into main am: 790c6315c3 am: 95503ac488 am: 83a51a019e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2699873

Change-Id: Ife37c3de4d663b3a74ea2286b9b41d5206a87bac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 02:46:48 +00:00
Treehugger Robot
83a51a019e Merge "snapuserd: Remove host_supported from snapuserd_test until it passes." into main am: 790c6315c3 am: 95503ac488
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2699873

Change-Id: I22d19435580b0d52ad7d175045a605ef9a6ba296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 02:04:11 +00:00
Treehugger Robot
a5db3a9c24 Merge "crasher: add pac and bti crashes." into main am: 8f5fab42df am: 095a784d07 am: fee315852e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2699774

Change-Id: I6a1278198a93dca18952ac1de667ed2c12caced1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 01:21:32 +00:00
Daniel Zheng
5f5e67f1a4 Merge "Adding struct to hold compresion parameters" into main am: 5061a1cef8 am: 1f0b04a3d8 am: 0dd8b96f9c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2697599

Change-Id: I22aeb2550e2c26dad251101e39e89325b1cf03c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 01:21:19 +00:00
Treehugger Robot
95503ac488 Merge "snapuserd: Remove host_supported from snapuserd_test until it passes." into main am: 790c6315c3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2699873

Change-Id: I31c54e1ad824d81b262577a3594745c228072211
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 01:19:17 +00:00
Treehugger Robot
790c6315c3 Merge "snapuserd: Remove host_supported from snapuserd_test until it passes." into main 2023-08-09 00:44:39 +00:00
Treehugger Robot
fee315852e Merge "crasher: add pac and bti crashes." into main am: 8f5fab42df am: 095a784d07
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2699774

Change-Id: I3d9741eb0f8ceb2627a4a08c71aa2a9ede32a72f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 00:36:20 +00:00
Daniel Zheng
0dd8b96f9c Merge "Adding struct to hold compresion parameters" into main am: 5061a1cef8 am: 1f0b04a3d8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2697599

Change-Id: I7ccf09c214585eb63ce05ebdb8bda61a356c6663
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 00:36:06 +00:00
David Anderson
1615b1b230 Merge changes Ic18443d4,I9e9af999,I10e099fe,I00cf6ec9,Ia1ea4ba7 into main am: 7bd9162b14 am: fc3b122231 am: 9006e4aea0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2695353

Change-Id: Ifef21b04fdca30aa8131fe0efcb1193b9f021b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 00:13:31 +00:00
Treehugger Robot
095a784d07 Merge "crasher: add pac and bti crashes." into main am: 8f5fab42df
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2699774

Change-Id: I12b812799837ded94cb4ab7795047680927072ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 23:50:24 +00:00
Daniel Zheng
1f0b04a3d8 Merge "Adding struct to hold compresion parameters" into main am: 5061a1cef8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2697599

Change-Id: Ia38cfb1edaba1c8108b50da9aa2f9a15956abc34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 23:49:59 +00:00
Treehugger Robot
8f5fab42df Merge "crasher: add pac and bti crashes." into main 2023-08-08 23:47:21 +00:00
David Anderson
8665b5f9df snapuserd: Remove host_supported from snapuserd_test until it passes.
Bug: 295074841
Test: snapuserd_test
Change-Id: Ie51263ec6971f9806bcfa2b522e5ed24da5d65cf
2023-08-08 16:34:19 -07:00
David Anderson
9006e4aea0 Merge changes Ic18443d4,I9e9af999,I10e099fe,I00cf6ec9,Ia1ea4ba7 into main am: 7bd9162b14 am: fc3b122231
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2695353

Change-Id: Id8ef968a9bdb3e9ce040afe5a25da6b5952ab8e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 23:25:19 +00:00
Daniel Zheng
5061a1cef8 Merge "Adding struct to hold compresion parameters" into main 2023-08-08 23:08:03 +00:00
Elliott Hughes
1b13b14758 crasher: add pac and bti crashes.
Also add the missing `.size` directives to all the assembler functions
for slightly improved backtraces.

Test: crasher64 pac; crasher64 bti
Change-Id: I8e0c127cbff56c33637e6ca8f1d927b971951807
2023-08-08 16:06:24 -07:00
David Anderson
fc3b122231 Merge changes Ic18443d4,I9e9af999,I10e099fe,I00cf6ec9,Ia1ea4ba7 into main am: 7bd9162b14
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2695353

Change-Id: If3042ba391fa3e876ae59deff138d622d64f3b7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 22:44:46 +00:00
David Anderson
7bd9162b14 Merge changes Ic18443d4,I9e9af999,I10e099fe,I00cf6ec9,Ia1ea4ba7 into main
* changes:
  snapuserd: Reduce size of COWs in tests.
  snapuserd: Add unit tests for ReadWorker::ReadAlignedSector.
  snapuesrd: Build snapuserd_test on host.
  snapuserd: Add an ITestHarness implementation for hosts.
  snapuserd: Don't specify a path to TemporaryFile.
2023-08-08 22:11:35 +00:00
David Anderson
cec5299620 Merge changes Ib33dc593,I6550682f,Ic0681cbf,Iaaf96a37,I89b15492 into main am: 9c525ff0ed am: 9b306bab11 am: 63e0a6f254
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2695350

Change-Id: Ie2073a5ccdaa55085a2cea4301ccb16dd88d618f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 21:57:44 +00:00
David Anderson
63e0a6f254 Merge changes Ib33dc593,I6550682f,Ic0681cbf,Iaaf96a37,I89b15492 into main am: 9c525ff0ed am: 9b306bab11
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2695350

Change-Id: I65507f16445cf8a39f5f9ad4911f64943d367dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 21:12:44 +00:00
Daniel Zheng
ad5df32560 decompressor maintenence
cleaning up a bit of code for consistency + adding in zstd to
FromString() function

Test: m libsnapshot
Change-Id: Ic8b7243c5a5ee25326a46e944c13578136f27078
2023-08-08 13:49:27 -07:00
David Anderson
9b306bab11 Merge changes Ib33dc593,I6550682f,Ic0681cbf,Iaaf96a37,I89b15492 into main am: 9c525ff0ed
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2695350

Change-Id: I309c8307fe7515011ed16890480f00998bf87181
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 20:31:37 +00:00
David Anderson
9c525ff0ed Merge changes Ib33dc593,I6550682f,Ic0681cbf,Iaaf96a37,I89b15492 into main
* changes:
  snapuserd: Factor a base class out of tests.
  snapuserd: Add error propagation to tests.
  snapuserd: Add diagnostics for debugging races.
  snapuserd: Fix race condition in HandleManager shutdown.
  snapuserd: Remove test dependence on LoopDevice.
2023-08-08 19:46:53 +00:00
Daniel Zheng
fe6c1d55f7 Moving includes
Removing unused includes + moving includes to file that uses them

Test: m libsnapshot
Change-Id: Iacb1d1d0d17cf9059583443e9a17fdc1007bc399
2023-08-08 12:29:14 -07:00
Daniel Zheng
50460fa3ac libsnapshot: take in compression_level
Changing libsnapshot to have configurable compression_level

Test: ota_from_target_files
Change-Id: I4c050a2c83cc0fa9079f94dd2d9009f291358740
2023-08-08 12:29:12 -07:00