Commit graph

88738 commits

Author SHA1 Message Date
Florian Mayer
6639147c4b Merge "Revert "Add TEST_MAPPING for debuggerd CTS"" into main am: f8a75c9e53
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2984791

Change-Id: I834c37dd124a05cdb3e9a9484373494149e21df9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 23:51:33 +00:00
Florian Mayer
f8a75c9e53 Merge "Revert "Add TEST_MAPPING for debuggerd CTS"" into main 2024-02-29 23:02:51 +00:00
Treehugger Robot
b1aa489b06 Merge "adb-remount-test: Adb shell command could return 0 or 255 if device is disconnected" into main am: b6fc19c308
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2984453

Change-Id: Ie2d930c3d29e3e6f9c65a979649a7c73b5746329
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 17:45:29 +00:00
Treehugger Robot
b6fc19c308 Merge "adb-remount-test: Adb shell command could return 0 or 255 if device is disconnected" into main 2024-02-29 16:59:14 +00:00
Oluwarotimi Adesina
aa48834485 Revert "Add TEST_MAPPING for debuggerd CTS"
This reverts commit d059478ee1.

Reason for revert: Potential culprit for b/327525776- verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: I4b713aa46b2869a677a210cfce6ae880366b045e
2024-02-29 15:10:09 +00:00
Yi-Yo Chiang
2f298bcb21 adb-remount-test: Adb shell command could return 0 or 255 if device is
disconnected

Background: aosp/I25f740bd222263fcb3c501def38977db6af1e0d9

Bug: 327552188
Test: abtd
Change-Id: Ida33bfa00887e8ac358e057fc37fd45095ccc26b
2024-02-29 19:45:14 +08:00
Akilesh Kailash
23c658aa3a Merge "Reapply "snapshotctl: Add apply-update option"" into main am: 3aef00da3d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2982153

Change-Id: Ia7d40f392e5587372452fee65e03ada30b19f8c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 07:13:21 +00:00
Akilesh Kailash
3aef00da3d Merge "Reapply "snapshotctl: Add apply-update option"" into main 2024-02-29 06:27:11 +00:00
Florian Mayer
190c6a96d7 Merge "Add TEST_MAPPING for debuggerd CTS" into main am: d685442133
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2982892

Change-Id: I5c9854591abd654853a45ecd0a481997e6c0ebf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 03:11:27 +00:00
Florian Mayer
d685442133 Merge "Add TEST_MAPPING for debuggerd CTS" into main 2024-02-29 02:29:09 +00:00
Treehugger Robot
b14976ab85 Merge "aconfig_storage: fix aconfig storage dir permissions" into main am: 87e978bc47
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2982792

Change-Id: Ife7a9df6eda11d2597bcff4f88811cfae99ca60a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 01:44:33 +00:00
Treehugger Robot
87e978bc47 Merge "aconfig_storage: fix aconfig storage dir permissions" into main 2024-02-29 01:01:11 +00:00
Treehugger Robot
0eddc2dfd0 Merge "Support for striped in libdm" into main am: 8fefa5a96b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2919352

Change-Id: Id8979349d1e253ebab0d7758f1a4976a82616597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 23:54:52 +00:00
Treehugger Robot
8fefa5a96b Merge "Support for striped in libdm" into main 2024-02-28 23:16:32 +00:00
Dennis Shen
6884e27d8e aconfig_storage: fix aconfig storage dir permissions
Bug: b/312444587
Test: m and launch AVD
Change-Id: I8db6bf8ffde40c9266e17d818d1e88d7e095a93e
2024-02-28 21:20:35 +00:00
Akilesh Kailash
cac1cf3ae9 Reapply "snapshotctl: Add apply-update option"
This reverts commit 1af7260931.

Fix: Allow BootControlClient.h to be used in -user builds

Bug: 319309466
Test: Build on -user branch
Change-Id: I93e95e35b29a98816b2f33fe9fa6859655934cd5
2024-02-28 11:29:10 -08:00
Florian Mayer
d059478ee1 Add TEST_MAPPING for debuggerd CTS
Change-Id: I3bba97e7a0a2b053c6d5577496efa2dca29035d4
2024-02-28 11:12:58 -08:00
Akilesh Kailash
22a5579e8d Merge "Revert "snapshotctl: Add apply-update option"" into main am: 01d754d672
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2980593

Change-Id: I70c7f06aae52194b1a50e26fac2fe3ad1d69abc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 15:34:44 +00:00
Akilesh Kailash
01d754d672 Merge "Revert "snapshotctl: Add apply-update option"" into main 2024-02-28 14:55:05 +00:00
Justin Yun
183c38c21b Merge "Make libvendorsupport_llndk_headers available to APEXes" into main am: 647532674d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2979371

Change-Id: I90507205ccabcbff20a75e8f8cdd2030e943879e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 11:10:07 +00:00
Justin Yun
647532674d Merge "Make libvendorsupport_llndk_headers available to APEXes" into main 2024-02-28 10:24:34 +00:00
Raphaël Hérouart
1af7260931 Revert "snapshotctl: Add apply-update option"
This reverts commit 77337c2975.

Reason for revert: b/327325747

Change-Id: I6796717774d28a7c306e19dd448c3c830f3fd550
2024-02-28 10:12:05 +00:00
Akilesh Kailash
1cc5c24901 Merge "snapshotctl: Add apply-update option" into main am: 209266f4f6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2954451

Change-Id: Ie0ca7629d27a07ea688c6546416e0443edd3f59c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 07:27:59 +00:00
Akilesh Kailash
209266f4f6 Merge "snapshotctl: Add apply-update option" into main 2024-02-28 06:43:59 +00:00
Akilesh Kailash
77337c2975 snapshotctl: Add apply-update option
$snapshotctl apply-update <directory containing snapshot patches>

This command is equivalent to applying incremental-ota but
bypasses all of the update-engine subsystem. Snapshot-patches
which are created on the host will be used directly and
will be written to the COW block devices.

No change to any of the libsnapshot or the I/O path logic.

Once the snapshot patches are applied, device is ready
to reboot as if an OTA update is applied.

Once the device reboots, snapshot merge will be initiated
as usual.

This will help test the changes to libsnapshot + init + snapuserd
extremely quick.

Incremental flashing becomes quite simple in the CI workflow.

Here are numbers tested on live builds where the actual builds/testing
is done on CI.

Patch-Create+Apply = Create the snapshot patches between two
builds and apply them to the device

Branch(main)     Patch-Creation+Apply Merge        Snapshot-size
=================================================================
Build-1 -> Build-2  14 seconds        40 seconds   160MB

Build-2 -> Build-3  21 seconds        26 seconds   331MB

Build-3 -> Build-4  30 seconds        45 seconds   375MB

Build-X -> Build-X  3 seconds	       4 seconds   8MB

Bug: 319309466
Test: On Pixel 6, incremental builds

Change-Id: I271b2cb5df4abde91571ec70ce06f926a1d01694
Signed-off-by: Akilesh Kailash <akailash@google.com>
2024-02-27 14:21:14 -08:00
Elliott Hughes
5a09eb7e6d Merge "Remove support for Linux before 3.11 (without O_TMPFILE)." into main am: 77a80d1744
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2978811

Change-Id: Id012bc969ddbf4be06056e23faf2f03f6eadee4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-27 16:49:20 +00:00
Elliott Hughes
77a80d1744 Merge "Remove support for Linux before 3.11 (without O_TMPFILE)." into main 2024-02-27 16:14:52 +00:00
Elliott Hughes
aa1d18a59b Remove support for Linux before 3.11 (without O_TMPFILE).
We don't support kernels that old any more.

Test: treehugger
Change-Id: Ia664de6921901dec54644cff9f51e8514258e257
2024-02-27 16:14:12 +00:00
Justin Yun
2768cf6ea2 Make libvendorsupport_llndk_headers available to APEXes
libvendorsupport_llndk_headers provide libvendorsupport_llndk_headers
macro that can be used in any libraries including APEXes.

Bug: 302113279
Test: TH
Change-Id: I8fc7879a378a3711ae7264c9a2d8b0955895147f
2024-02-27 18:46:58 +09:00
Treehugger Robot
c73f61be26 Merge "Define __INTRODUCED_IN_LLNDK" into main am: fb97c97932
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2975232

Change-Id: Ia41f02cdcb1053272e985bf55ab977c009f28a22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-27 08:55:25 +00:00
Treehugger Robot
fb97c97932 Merge "Define __INTRODUCED_IN_LLNDK" into main 2024-02-27 08:16:45 +00:00
Justin Yun
f3e89b8db4 Define __INTRODUCED_IN_LLNDK
Symbols with __INTRODUCED_IN_LLNDK are available for LLNDK only if
the vendor api level set by the RELEASE_BOARD_API_LEVEL is equal to
or newer than the target vendor api level in __INTRODUCED_IN_LLNDK.

This works only for the vendor variants at the same time ignoring
__INTRODUCED_IN annotation for the vendor variants. On the other
hand, __INTRODUCED_IN_LLNDK will be ignored from non-vendor variants.

Bug: 302113279
Test: build
Change-Id: I5317a73dbc73095f8d5d95131ca4d9ed39df6be1
2024-02-27 07:48:43 +00:00
Christopher Ferris
b878631621 Merge "Format all of the blueprint files." into main am: bf970740ce
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2978751

Change-Id: I6e668cbf8d9ef6ae2f8922825af29a97f6625e4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-27 02:42:26 +00:00
Christopher Ferris
bf970740ce Merge "Format all of the blueprint files." into main 2024-02-27 02:10:24 +00:00
Florian Mayer
19a8e857a7 Merge "Make tombstones 664." into main am: d3fb7a6355
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2976111

Change-Id: I9122be975b468dfdaa017a79d8fee154d14bf124
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-26 22:02:01 +00:00
Christopher Ferris
2bf7db3de0 Format all of the blueprint files.
I'm tired of seeing the bpfmt warning, so fix this for all debuggerd
blueprint files.

Test: Compiles
Change-Id: I3b25365a7272aebe9cbac28455cf8b9b86b04c6e
2024-02-26 13:34:38 -08:00
Florian Mayer
d3fb7a6355 Merge "Make tombstones 664." into main 2024-02-26 21:12:25 +00:00
Jooyung Han
14f00567a9 Merge "init: move generated_android_ids to host_init_verifier" into main am: 3289747a5c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2976531

Change-Id: I334c0f0e80fbc0ef4429a45ddfffe569f2ac4c36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-26 08:17:42 +00:00
Jooyung Han
3289747a5c Merge "init: move generated_android_ids to host_init_verifier" into main 2024-02-26 07:38:16 +00:00
Jooyung Han
18407b7870 init: move generated_android_ids to host_init_verifier
It's used only by host_init_verifier. This is to remove the unnecessary
dependency from clients of init_host_defaults.

Bug: 326509378
Test: mmma system/core/init
Change-Id: I983fbfe616f0bcb87940c934e19f614d3bf51030
2024-02-26 11:18:00 +09:00
Akilesh Kailash
ea798470a0 Merge "libsnapshot: Fetch device size from header" into main am: 7428705371
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2974622

Change-Id: I42f1f048d6a8298c8cb82f7f3eef710998598743
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-24 07:17:43 +00:00
Akilesh Kailash
7428705371 Merge "libsnapshot: Fetch device size from header" into main 2024-02-24 06:36:36 +00:00
Treehugger Robot
a1e7728329 Merge "minor doc improvement for tombstone fd code" into main am: 1076e7f7a3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2976171

Change-Id: I780a2f085005c7f603b086324b3354bdde21316e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-24 05:32:59 +00:00
Treehugger Robot
1076e7f7a3 Merge "minor doc improvement for tombstone fd code" into main 2024-02-24 05:02:23 +00:00
Florian Mayer
877d1f6694 Make tombstones 664.
They are still restricted by SELinux, and apps still cannot open them
because they don't have `open` SELinux permission.

Bug: 312740614
Change-Id: I83b7e6ed39f5af64f161af3b3e8e33af0d125b20
2024-02-23 15:31:30 -08:00
Akilesh Kailash
69d574c612 libsnapshot: Fetch device size from header
Now that V3 is enabled, relax the header version check.
For V3, header op_count_max contains the information of the device size.

Bug: 299011882
Test: snapshotctl map-snapshots on Pixel with V3 format

Change-Id: Ia1cb20b24857136a742e20408ee95e56e98b256a
Signed-off-by: Akilesh Kailash <akailash@google.com>
2024-02-23 22:26:42 +00:00
Florian Mayer
23e9289e69 minor doc improvement for tombstone fd code
Change-Id: I8037d9dd5a6c0e86e853d001ccedc472ce61d107
2024-02-23 22:16:03 +00:00
Elliott Hughes
f795d2bf16 Merge "Reduce <CallStack.h> namespace pollution." into main am: d6ccb0b1d9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2974871

Change-Id: Iffec5a500704a4738bb4240eef3da612250d2782
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-23 16:56:34 +00:00
Elliott Hughes
d6ccb0b1d9 Merge "Reduce <CallStack.h> namespace pollution." into main 2024-02-23 16:15:06 +00:00
Daniel Zheng
f8dc763dd6 Merge "libsnapshot: stride compression" into main am: 4edb9c0088
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2958927

Change-Id: Ie82f6011ed81d7dc10671927472c5dec475fd158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-23 06:34:20 +00:00