Commit graph

84130 commits

Author SHA1 Message Date
Po-yao Chang
6fe9367f7b Run boringssl tests according to ro.zygote
If ro.zygote is zygote64, don't bother running 32-bit test.
Otherwise abilist{32,64} decides what tests to run.

Bug: 291874369
Test: make gsi_arm64-user; Check /system/etc/init/hw
Change-Id: Id10b2242606d6400acc29c3174f713581d6cce2e
2023-08-10 17:12:47 +08:00
Jooyung Han
5c4217cf6e Read .rc files from bootstrap apexes
To start an early_hal service from a bootstrap vendor apex, init now
reads .rc files from bootstrap apexes as well.

In this change, perform_apex_config command is re-purposed to support
bootstrap mode. Now we have some similarity between two apexd calls:

- for bootstrap apexes (in the bootstrap mount namespace):

  exec_start apexd-bootstrap
  perform_apex_config --bootstrap

- for normal apexes (in the default mount namespace):

  restart apexd
  ...
  wait_for_prop apexd.status activated
  perform_apex_config

Note that some tasks in perform_apex_config are not needed in the
bootstrap.  For example, we don't need to create apexdata directories
for bootstrap apexes.

Bug: 290148081
Test: VendorApexHostTestCases
Change-Id: I8f683a4dcd7cd9a2466a4b1b417d84c025c37761
2023-08-10 15:40:06 +09:00
Treehugger Robot
6e543b0ed9 Merge "Remove gettid symbol from cutils" into main am: 0c0dafae8d am: 26af0ec2d7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2681176

Change-Id: I042ec24af1c1e6aa4f3500a9e0815a721da80013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10 05:47:26 +00:00
Treehugger Robot
26af0ec2d7 Merge "Remove gettid symbol from cutils" into main am: 0c0dafae8d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2681176

Change-Id: I4c44ab32cf585e89e06a2d343317a721cf0a63de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10 05:01:51 +00:00
Treehugger Robot
0c0dafae8d Merge "Remove gettid symbol from cutils" into main 2023-08-10 04:13:24 +00:00
Jooyung Han
468238cf48 Merge "Use /bootstrap-apex for bootstrap APEXes" into main am: 370ee1bbda am: ef8229fb0b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2700774

Change-Id: I7f08e863762e313450719020b161a6b60dcf383d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10 03:57:53 +00:00
Jooyung Han
ef8229fb0b Merge "Use /bootstrap-apex for bootstrap APEXes" into main am: 370ee1bbda
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2700774

Change-Id: I98404432e5d8a6d355388728200133e84a469ebb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10 03:11:15 +00:00
Jooyung Han
370ee1bbda Merge "Use /bootstrap-apex for bootstrap APEXes" into main 2023-08-10 02:38:30 +00:00
Christopher Ferris
3a0833c9cd Fix potential miscellaneous debuggerd issues.
Check for the log opening failing.

Add the ability to put error messages in the log and tombstone so
that it's clear if the log reading failed in some way.

Adjust test so that if there is a log or if no log exists, the test
will still pass.

Print an <unknown> if the command line is unreadable instead of nothing.

Test: Ran unit tests.
Test: Induced error and verified error message is save in tombstone.
Change-Id: I2fce8078573b40b9fed3cd453235f3824cadb5e3
2023-08-09 17:31:55 -07:00
Treehugger Robot
8072480b4f Merge "debuggerd: fix passing of fdsan_table to crash_dump" into main am: cf32fd18d4 am: 611837f4f3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2701913

Change-Id: Ib688d90912b77a70d7a8709251a60f148f04f5c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10 00:31:52 +00:00
Treehugger Robot
611837f4f3 Merge "debuggerd: fix passing of fdsan_table to crash_dump" into main am: cf32fd18d4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2701913

Change-Id: Ieb0fb13cc1a8519497595dc24517bd9ca5adbaff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 23:46:19 +00:00
Treehugger Robot
cf32fd18d4 Merge "debuggerd: fix passing of fdsan_table to crash_dump" into main 2023-08-09 23:15:06 +00:00
Tomislav Novak
24a7df5d38 debuggerd: fix passing of fdsan_table to crash_dump
Commit aosp/1259140 moved fdsan_table into debugger_process_info, which
is populated conditionally. This introduced a bug where the process that
receives BIONIC_SIGNAL_DEBUGGER (35) does not propagate the fdsan_table
pointer to crash_dump:

  $ adb shell kill -SIG35 <pid>
  $ adb logcat -s DEBUG
  E DEBUG   : failed to read fdsan table entry 0: I/O error

Fdsan in warn-only mode uses BIONIC_SIGNAL_DEBUGGER[1], so the generated
tombstones don't have any fd ownership info.

Fix it by calling get_process_info() irrespective of the signal being
handled, taking care to preserve the previous behavior of not showing
abort messages set by applications in non-fatal dumps.

Test: debuggerd_test
Test: send SIG35 to arbitrary process and inspect the log and tombstone
Test: crasher fdsan_file

[1] 20ad9129e7/libc/bionic/fdsan.cpp (166)

Change-Id: I76931ca4825e846fc99f26fa590c045130abb850
2023-08-09 15:19:51 -07: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
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
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
David Drysdale
cedcb4cd92 KeyMint HAL: process destroyAttestationIds
Bugs: 283049310
Test: VtsAidlKeyMintTargetTest using disabled test
Change-Id: I545511a7a701faf8e82dff9c169c3738f2c30e6d
2023-08-09 11:32:52 +01:00
Jooyung Han
566c65239f Use /bootstrap-apex for bootstrap APEXes
This new directory is bind-mounted to /apex in the bootstrap mount
namespace so that apexd-bootstrap mounts bootstrap APEXes there via
/apex.

The directory is shared between two mount namespaces, hence visible
in the default mount namespace.

Bug: 290148078
Test: VendorApexHostTestCases
Change-Id: I841480e41be8def5a4c6a4aa874c4e21465a71d3
2023-08-09 17:27:39 +09: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
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
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
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