Commit graph

90484 commits

Author SHA1 Message Date
Treehugger Robot
4028fa121b Merge "Fix overlayfs on page cf page agnostic builds." into main am: 0edd0412f9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3323914

Change-Id: I699a3557b7b1a15e59d1afa64c17c0aaf471a68c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-29 16:23:06 +00:00
Treehugger Robot
0edd0412f9 Merge "Fix overlayfs on page cf page agnostic builds." into main 2024-10-29 15:58:42 +00:00
David Anderson
dea6f7c2a5 Fix overlayfs on page cf page agnostic builds.
Hardcode 4096 block size for f2fs on x86/64.

Bug: 375531898
Test: adb_remount_test.sh
Change-Id: I9b55f7caf1b77f235168664be2f310bb3bb0d179
2024-10-28 19:50:08 -07:00
Automerger Merge Worker
3cfc06cb47 Merge "Merge "libsnapshot: Fix MapAllSnapshotsWithoutSlotSwitch test" into android15-tests-dev am: e4ffb7a97b" into main am: 7a813fd35c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3316253

Change-Id: I69d481433a4939c0c08e2236b865408241ea222c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-29 00:27:39 +00:00
Automerger Merge Worker
7a813fd35c Merge "Merge "libsnapshot: Fix MapAllSnapshotsWithoutSlotSwitch test" into android15-tests-dev am: e4ffb7a97b" into main 2024-10-29 00:12:37 +00:00
Treehugger Robot
5561704933 Merge "libsnapshot: Fix MapAllSnapshotsWithoutSlotSwitch test" into android15-tests-dev am: e4ffb7a97b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3316253

Change-Id: I38b52550e194c6d5666f11cc159f264aa012aa3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-29 00:12:33 +00:00
Treehugger Robot
e4ffb7a97b Merge "libsnapshot: Fix MapAllSnapshotsWithoutSlotSwitch test" into android15-tests-dev 2024-10-28 23:59:07 +00:00
Daeho Jeong
2f0861a251 Merge "support f2fs device aliasing feature" into main am: d7b46e396d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3315995

Change-Id: I81ccd64a7e938d1e1eb79a9a699c1e1f91400ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-28 16:31:44 +00:00
Daeho Jeong
d7b46e396d Merge "support f2fs device aliasing feature" into main 2024-10-28 16:19:45 +00:00
Konrad Adamczyk
4550dd671a Merge "Revert^2 "init: Look for super partition only on a boot device"" into main am: 0508b53f0c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3314844

Change-Id: I15ff90bc23bc315b5564387aa3bad0b41e432d6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-28 06:52:30 +00:00
Konrad Adamczyk
0508b53f0c Merge "Revert^2 "init: Look for super partition only on a boot device"" into main 2024-10-28 06:35:07 +00:00
Treehugger Robot
b266c408a6 Merge "libprocessgroup: Remove ifdefery around SetTimerSlackAction::ExecuteForTask" into main am: a2db8b55d6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3320897

Change-Id: I2c6f2afffa8d910b89758512f7bcc703b8e396de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-26 04:31:48 +00:00
Treehugger Robot
a2db8b55d6 Merge "libprocessgroup: Remove ifdefery around SetTimerSlackAction::ExecuteForTask" into main 2024-10-26 04:16:35 +00:00
T.J. Mercier
96fc434b6c libprocessgroup: Remove ifdefery around SetTimerSlackAction::ExecuteForTask
This appears to have been due to the use of prctl, which apparently
caused issues for mac builds. Now that use of prctl has been removed, it
doesn't look like we need this anymore.

Fixes: 075008174 ("libprocessgroup: Remove prctl interface for setting timer slack")
Test: m
Bug: 372498744
Change-Id: I8a43951f30d7dd838591a8ba225d712742d7cd4a
2024-10-26 00:34:51 +00:00
Karuna Wadhera
6066ad7fa1 Merge "Pin KeyMint dependency to correct/specific version" into main am: 813a0fe2b2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3317875

Change-Id: If9df41d6f2725dd8d4c84b612a3cd17edc37e4fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-25 22:11:14 +00:00
Karuna Wadhera
813a0fe2b2 Merge "Pin KeyMint dependency to correct/specific version" into main 2024-10-25 21:54:58 +00:00
Treehugger Robot
ac04448403 Merge "Don't use android::base::StartsWith / EndsWith" into main am: 2a278c3a2e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3319739

Change-Id: I8e82bcbba7c8e3a4f85f75cbc0e24fe8fd98e41e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-25 21:07:28 +00:00
Treehugger Robot
2a278c3a2e Merge "Don't use android::base::StartsWith / EndsWith" into main 2024-10-25 20:35:23 +00:00
William McVicker
c6a332b5b4 Merge "Add support to update the DTB when flashing a vendor_boot ramdisk" into main am: 29a05161b1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3318009

Change-Id: I47b685a070dff253f0b9878aff5caa81510b1be4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-25 18:16:30 +00:00
William McVicker
29a05161b1 Merge "Add support to update the DTB when flashing a vendor_boot ramdisk" into main 2024-10-25 17:53:25 +00:00
T.J. Mercier
9611c18aa2 Don't use android::base::StartsWith / EndsWith
These libbase functions now directly pass through to the standard
library. [1] Use the standard library directly, and eliminate this
dependency on libbase.

[1] https://r.android.com/c/platform/system/libbase/+/3315082

Change-Id: I83d79ffa2658f30ae09a7f27cedf14e62b5df41d
2024-10-25 17:20:01 +00:00
Daeho Jeong
77ee43a9fe support f2fs device aliasing feature
We can hold the storage space of one of f2fs multi-device for data
partition, while allowing the space to be used by another purpose.
f2fs will create a sequential and pinned file as a placeholder and it
can be deallocated and returned back to data partition after it is done
with using it. We can create the file, as we define the device with
"exp_alias:" tag in the fstab.

Bug: 336319772
Test: add a device with "exp_alias" tag in fstab
Change-Id: If55730cedd21ec5a40137d2eb723a97df498c9cb
Signed-off-by: Daeho Jeong <daehojeong@google.com>
2024-10-25 14:58:38 +00:00
Will McVicker
b544df0e15 Add support to update the DTB when flashing a vendor_boot ramdisk
When updating the vendor_boot ramdisk, there may be device tree
dependencies that require updating the device tree with the new ramdisk
which contains the first stage init kernel modules. This patch adds the
support to use the `--dtb /path/to/dtb` option to update the DTB when
updating the vendor_boot ramdisk. To do so, run the command:

  fastboot flash --dtb /path/to/dtb.img \
      vendor_boot:<RAMDISK_NAME> /path/to/ramdisk

Test: fastboot_vendor_boot_img_utils_test
Test: Verifed updating the dtb with the above command on r4
Bug: 368308832
Change-Id: Iaa1867fe64054971a698497a2e3486424fed19fe
2024-10-24 15:03:36 -07:00
Treehugger Robot
9c2a940742 Merge "init: filter .##rc with preview SDK version" into main am: e4acb47ba9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3309495

Change-Id: Iacf08b2bb62cee2c1686c0cfbc1ee38eb5da8cc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-24 08:17:18 +00:00
Treehugger Robot
e4acb47ba9 Merge "init: filter .##rc with preview SDK version" into main 2024-10-24 08:02:49 +00:00
Konrad Adamczyk
5bfb93678f Revert^2 "init: Look for super partition only on a boot device"
This reverts commit 8d71220df2.

Reason for revert: Fix for gcar emulator (basically all QEMU-based emulators) landed at aosp/3315253 and aosp/3160116.

Change-Id: If4eddd3f7e224c31019ad3bd752e2375c7567780
2024-10-24 07:28:25 +00:00
Karuna Wadhera
03f7133b0e Pin KeyMint dependency to correct/specific version
libkeymint depends on the latest version of the HAL, which will soon be
bumped to v4. Since this implementation won't immediately be upgraded,
and this dependency seems unused, remove it.

Bug: 369375199
Test: Treehugger
Change-Id: I5e952595bb4d4d8a283b286b5054576394788f16
2024-10-23 23:13:13 +00:00
Akilesh Kailash
77dc1e7df3 libsnapshot: Fix MapAllSnapshotsWithoutSlotSwitch test
IsUserspaceSnapshotUpdateInProgress() would return dm partitions
which are backed by verity; this check is invalid for tests.

Bug: 369964380
Test: vts_libsnapshot_test64 --gtest_filter=SnapshotUpdateTest.MapAllSnapshotsWithoutSlotSwitch
Change-Id: I7d207c472077042ea07b65bf81b64c9c240ae8c7
Signed-off-by: Akilesh Kailash <akailash@google.com>
(cherry picked from commit 68c2cbf2be)
2024-10-23 07:11:50 +00:00
Treehugger Robot
032049886a Merge "Remove dependencies on the 1-variant fallback" into main am: 07e913e85e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3317641

Change-Id: I1387159822d169e207a4f6ac7c784b2889be351a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-23 03:44:50 +00:00
Treehugger Robot
07e913e85e Merge "Remove dependencies on the 1-variant fallback" into main 2024-10-23 03:23:18 +00:00
Cole Faust
09c18c17fd Remove dependencies on the 1-variant fallback
When adding a dependencies, if the variants don't match, but the
dependency only has 1 variant anyways, soong will always use that
variant. This makes it hard to add new variants to soong, because the
1-variant fallback stops being used and you start getting missing
variant errors. Make changes to bp files such that all dependencies
correctly specify the variant to use.

Bug: 372091092
Flag: EXEMPT refactor
Test: m nothing
Change-Id: I35a5ac0e6b63080f692be6597edf5f213c4e7acb
2024-10-22 16:33:50 -07:00
Akilesh Kailash
074108f361 Merge "libsnapshot: Fix MapAllSnapshotsWithoutSlotSwitch test" into main am: 3aa27b095d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3315314

Change-Id: Ia6d339eb9931094c2550c5c519cb49edfecc67db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-22 20:29:01 +00:00
Akilesh Kailash
3aa27b095d Merge "libsnapshot: Fix MapAllSnapshotsWithoutSlotSwitch test" into main 2024-10-22 19:51:49 +00:00
Akilesh Kailash
68c2cbf2be libsnapshot: Fix MapAllSnapshotsWithoutSlotSwitch test
IsUserspaceSnapshotUpdateInProgress() would return dm partitions
which are backed by verity; this check is invalid for tests.

Bug: 369964380
Test: vts_libsnapshot_test64 --gtest_filter=SnapshotUpdateTest.MapAllSnapshotsWithoutSlotSwitch
Change-Id: I7d207c472077042ea07b65bf81b64c9c240ae8c7
Signed-off-by: Akilesh Kailash <akailash@google.com>
2024-10-22 16:37:46 +00:00
T.J. Mercier
07d7a397c2 Merge changes from topic "reapply_no_cgroup.rc" into main am: 490b505a3f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3297569

Change-Id: I5e5bbcb055005df04f21a7ab8fe26f8daaeee2a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-22 15:21:03 +00:00
T.J. Mercier
8114b61383 Reapply "libprocessgroup: Remove ACgroupController_getMaxActivati..." am: 47580ff76d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3297568

Change-Id: I6f6fee9e79e15170701e15708b59cbb1af6bc0e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-22 15:20:59 +00:00
T.J. Mercier
1d2f8f43df Reapply "libprocessgroup: Remove dependency on libcgrouprc" am: c76b6ada23
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3297567

Change-Id: I07aaa26234901ca0fb40b9f4b85c131e140b89d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-22 15:20:56 +00:00
T.J. Mercier
f29b177370 Reapply "libprocessgroup: Remove cgroup.rc file" am: a09ee8ece6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3297566

Change-Id: I5483fadcb02e9a1771bc05e51bb9c2a06a09f4e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-22 15:20:51 +00:00
T.J. Mercier
490b505a3f Merge changes from topic "reapply_no_cgroup.rc" into main
* changes:
  Reapply "libprocessgroup: Combine all 3 ActivateControllers imple..."
  Reapply "libprocessgroup: Remove ACgroupController_getMaxActivati..."
  Reapply "libprocessgroup: Remove dependency on libcgrouprc"
  Reapply "libprocessgroup: Remove cgroup.rc file"
2024-10-22 15:07:17 +00:00
Treehugger Robot
27b80b1781 Merge "RefBase: document leak memory case" into main am: c9d8983be3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3316052

Change-Id: I2488aa206850a01a679ec82ac11009a8241797a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-22 02:00:42 +00:00
Treehugger Robot
c9d8983be3 Merge "RefBase: document leak memory case" into main 2024-10-22 01:35:53 +00:00
Yihan Dong
db6ca4037d Merge "Add proposed trendy teams for VTS modules" into main am: f255ce1786
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3304682

Change-Id: Id2c660f60f945759bc9efdb08b75c432a6af0ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-22 00:23:56 +00:00
Yihan Dong
f255ce1786 Merge "Add proposed trendy teams for VTS modules" into main 2024-10-22 00:09:17 +00:00
Spandan Das
60bac8e319 Merge "Mark the phony shell_and_utilities_vendor as vendor: true" into main am: b18bda3bca
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3315712

Change-Id: Ic81af611c9f9727478c29b914339dbdd02ea7790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-21 23:27:19 +00:00
Steven Moreland
a190ecb6f1 RefBase: document leak memory case
We should fix the leak, but it introduces the possibility
that something is use this. Instead, document best practice
(not to allocate RefBase objects on the stack).

Fixes: 295340906
Test: N/A
Change-Id: Ife7a561f790dc687fb99b73729818e61834fa272
2024-10-21 23:18:50 +00:00
Spandan Das
b18bda3bca Merge "Mark the phony shell_and_utilities_vendor as vendor: true" into main 2024-10-21 23:08:26 +00:00
Christopher Ferris
df576279b3 Merge "Remove log spam." into main am: 116a3d7b2a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3311358

Change-Id: I3665df3248efbe39e8b177b09d2969a28b21f548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-21 22:11:08 +00:00
Spandan Das
5331393cb1 Mark the phony shell_and_utilities_vendor as vendor: true
As part of the make to soong conversion, we are currently autogenerating
android_filesystem soong modules for each partition (system, system_ext,
vendor, ...), with the goal to eventually substitute the kati built
partitions. In order to generate the deps of these partitions, we are
currently using a heuristic to classify the modules in
`PRODUCT_PACKAGES` with the associated partition.

Mark the phony module `shell_and_utilities_vendor` as
`vendor: true` to help with this conversion heursitic.

Bug: 374371755
Test: verified that /bin/awk is present in the autogenerated soong-built
vendor partition

Change-Id: I0a99275fb03fbb9adeb1502734759f433585ef25
2024-10-21 22:04:20 +00:00
Christopher Ferris
116a3d7b2a Merge "Remove log spam." into main 2024-10-21 21:43:29 +00:00
Suren Baghdasaryan
5408d81178 Merge "Remove carlosgalo from libprocessgroup OWNERS" into main am: 0bbcaa7145
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3315590

Change-Id: I64c633004d045da9d38d4aec80d85e1e1305268e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-21 17:37:20 +00:00