Daniel Zheng
d545b31663
Merge "is_retrofit_device to work in bootloader" into main am: d774be9b05
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2759543
Change-Id: If431856a2ad838d2f7393c05600a24ddb610a0ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 19:04:30 +00:00
Daniel Zheng
d774be9b05
Merge "is_retrofit_device to work in bootloader" into main
2023-09-25 18:21:36 +00:00
Thiébaud Weksteen
9229827386
Merge "Skip /metadata/sepolicy creation" into main am: 911d309224
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2761545
Change-Id: I7acfa6f5cb28f051ca5fae7d641d216fe5254fcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 08:12:00 +00:00
Thiébaud Weksteen
911d309224
Merge "Skip /metadata/sepolicy creation" into main
2023-09-25 07:40:02 +00:00
Thiébaud Weksteen
a6b5f94687
Skip /metadata/sepolicy creation
...
Bug: 297794885
Test: presubmit
Change-Id: I93f94f319d0f86e1cad6f2a4912b5df3aae09cec
2023-09-25 16:07:47 +10:00
Treehugger Robot
8cd8ce3fc0
Merge "Create_cow: Hash of target blocks should not be stored." into main am: a2cd2202f0
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2759698
Change-Id: Ib652154e55c271260cbf0070af9c96f674c31709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-24 01:59:18 +00:00
Treehugger Robot
a2cd2202f0
Merge "Create_cow: Hash of target blocks should not be stored." into main
2023-09-24 00:46:55 +00:00
Treehugger Robot
9062abf0e5
Merge "Do not check with vendor vndk version" into main am: 6d01651ab9
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2758806
Change-Id: I50e76816f0a8b1b679d83bc382b9b3c8bd1e2bc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-23 14:09:27 +00:00
Treehugger Robot
6d01651ab9
Merge "Do not check with vendor vndk version" into main
2023-09-23 13:06:15 +00:00
Kiyoung Kim
45d88d496e
Do not check with vendor vndk version
...
Current libcutils checks if memfd is supported with vendor VNDK version,
but this is no longer valid if VNDK is deprecated. As we can assume that
any vendor using this code is supported as long as it is treblelized,
simplify logic to check if memfd is valid to vendor only with
'ro.treble.enabled' property.
Bug: 290159430
Test: Cuttlefish with VNDK deprecated worked without error from
libcutils
Change-Id: I351f0798da99cb4827bc3e424b63a2eaee5c7461
2023-09-23 21:06:57 +09:00
Akilesh Kailash
810274071d
Create_cow: Hash of target blocks should not be stored.
...
Target block hash was in-correctly getting added to map thereby
overriding the source-hash.
Bug: 299011882
Test: Flash Pixel 6 Pro from A->B and from B->A
Change-Id: Ib3887c29cd6b8f2abd50e932273a5cfc2a096bd5
Signed-off-by: Akilesh Kailash <akailash@google.com>
2023-09-23 01:07:47 -07:00
Elliott Hughes
503121ccea
Merge "Remove Windows workaround in file not built for Windows." into main am: d091aa44b3
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2760267
Change-Id: Id05b4a3222f5f17b2f55c9500a64f4763b59cd70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 23:32:23 +00:00
Elliott Hughes
d091aa44b3
Merge "Remove Windows workaround in file not built for Windows." into main
2023-09-22 22:56:38 +00:00
Treehugger Robot
6b38c7ed6f
Merge "Only skip _16k/_64k kernel modules dirs on 4K builds" into main am: 73fcd754ee
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2758048
Change-Id: I00811eee37bd2009cae6d793e8bab44fbafd0a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 22:38:06 +00:00
Treehugger Robot
73fcd754ee
Merge "Only skip _16k/_64k kernel modules dirs on 4K builds" into main
2023-09-22 21:55:11 +00:00
Daniel Zheng
d1acda3833
Merge "Removing extra includes" into main am: c4463ebee6
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2759542
Change-Id: I8c072e07b63995c28ed97b0db4801e1b4e15fa13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 20:52:10 +00:00
Daniel Zheng
f9098ffba4
Merge changes I343272f4,I5481893a into main am: 3d0d8e4b8f
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2755691
Change-Id: I8be48fac668ba07a2caadedb55bcf2fd6e1fca28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 20:51:55 +00:00
Ryan Prichard
4570cf0ce2
Merge changes I7790dde8,I065907a5,Id2e82024 into main am: 532a608f58
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2758070
Change-Id: I654dd3283ac4d072649d17afa6e091da35263be1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 20:50:27 +00:00
Daniel Zheng
5cbcdfae4e
is_retrofit_device to work in bootloader
...
Changing is_retrofit_device() to work in bootloader. Previously flashall
flow was to boot into fastbootd and then make a call to get
"super-image-name", however this does not work in bootloader. Since all
tasks are generated ahead of time, this old check will now fail and we
will fail to add the correct delete tasks in collectTasks(). This change
does make it so that is_retrofit check only works during fastboot
flashall + fastboot update (since this function is only used here,
nothing is currently affected).
To determine if a device is retrofit, it must satisfy two conditions -> Has
dynamic partitions && does not contain a super partition. The check for
if source has super_empty.img is sufficient for determining if a device
has dynamic partitions and if any single partition has
LP_PARTITION_ATTR_SLOT_SUFFIXED it is determined to be retrofit
Test: logs from fastboot update on sargo device confirms this check
returns true. Fastboot update on sargo
Bug: 300287332
Change-Id: Iadf5c56de51993a79307c60e45d6cc4988436f23
2023-09-22 13:22:57 -07:00
Daniel Zheng
c4463ebee6
Merge "Removing extra includes" into main
2023-09-22 19:51:59 +00:00
Daniel Zheng
3d0d8e4b8f
Merge changes I343272f4,I5481893a into main
...
* changes:
Removing headers + using string
Removing double delete from flashall
2023-09-22 19:51:25 +00:00
Ryan Prichard
532a608f58
Merge changes I7790dde8,I065907a5,Id2e82024 into main
...
* changes:
Add missing <assert.h> include
Add missing <functional> and <vector> includes
snapuserd_test: don't discard result of std::async
2023-09-22 19:42:45 +00:00
Treehugger Robot
1a262a11d4
Merge "Remove unused files." into main am: 59a2cde894
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2759693
Change-Id: I010f21c81092ee51bce7c7c5fdca39acef377826
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 19:03:33 +00:00
Treehugger Robot
de1aeee88d
Merge "Don't duplicate uapi ioprio constants." into main am: 46c366b0ed
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2759694
Change-Id: I6bfe444c1ed43240506d9031796bd1cf03a97ef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 19:03:19 +00:00
Treehugger Robot
c3bbf8237a
Merge "Remove redefinition of uapi constant added in R." into main am: d5b09b4b97
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2760268
Change-Id: I7301abb110d029f8bda465fe0fd569924f52b766
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 19:02:32 +00:00
Treehugger Robot
59a2cde894
Merge "Remove unused files." into main
2023-09-22 18:01:48 +00:00
Treehugger Robot
46c366b0ed
Merge "Don't duplicate uapi ioprio constants." into main
2023-09-22 18:00:19 +00:00
Treehugger Robot
d5b09b4b97
Merge "Remove redefinition of uapi constant added in R." into main
2023-09-22 17:58:03 +00:00
Kelvin Zhang
b4987345ff
Only skip _16k/_64k kernel modules dirs on 4K builds
...
The initramfs.img from kernel builds do not store kernel modules under
_16k directory. Currently, init is programmed to only load kernel
modules from _16k dir if running on 16K page size kernel. Relax this
restriction so that booting on custom 16K kernel would work without
going through platform rebuild.
Test: th
Bug: 293313353
Bug: 300184677
Change-Id: I9ee3c74066ad9ec5127f1e8662f7c1273445994c
2023-09-22 09:14:43 -07:00
Elliott Hughes
f6a84e4462
Remove Windows workaround in file not built for Windows.
...
Test: treehugger
Change-Id: I311cfbc9245cbe90ed6fc4fa379ff5b9abdf21e7
2023-09-22 15:44:42 +00:00
Elliott Hughes
3369fe9cbb
Don't duplicate uapi ioprio constants.
...
This code is only used in init and vold, so I suspect all the
conditional compilation could be moved into the .bp file instead, but
I'm just trying to clean up duplication today...
Test: treehugger
Change-Id: I97013f5de41e109a0cc377400c396145aed569db
2023-09-22 14:51:26 +00:00
Elliott Hughes
1faedd02a3
Remove redefinition of uapi constant added in R.
...
Test: treehugger
Change-Id: If0ef9c36b2f54eb59d222dedc6bf575d46c9db1d
2023-09-22 14:45:20 +00:00
Elliott Hughes
7107c582fa
Remove unused files.
...
Test: treehugger
Change-Id: I7ea71395b87eb12044fb3e7d19c171149f4cc90b
2023-09-22 14:33:47 +00:00
Ryan Prichard
87c90e7b65
Add missing <assert.h> include
...
Bug: 175635923
Test: m MODULES-IN-system-core-trusty
Change-Id: I7790dde8eba948cf95cb14dd2b436c3f6f88765a
2023-09-21 19:44:47 -07:00
Ryan Prichard
999efbef09
Add missing <functional> and <vector> includes
...
Bug: 175635923
Test: m MODULES-IN-system-core-libutils
Change-Id: I065907a58a88723ae512f155dfde2d2fcb3fc322
2023-09-21 17:52:29 -07:00
Ryan Prichard
93377e99e2
snapuserd_test: don't discard result of std::async
...
std::async returns a std::future whose destructor blocks until the
async function has completed, which defeats the purpose of using
std::async. The future needs to be kept alive to allow the function to
run concurrently.
Starting in C++20, std::async marked [[nodiscard]] to help catch this
misuse. Upgrading libc++ adds the [[nodiscard]] attribute to
std::async, so fixing this bug is necessary to keep the code compiling
after libc++ is updated.
Bug: 175635923
Test: treehugger
Test: m && m snapuserd_test
Change-Id: Id2e820248c2b6111aa843fb709e08a2c19677066
2023-09-21 17:52:18 -07:00
Treehugger Robot
5e32ce2d28
Merge "Delete unused DATA_MNT_POINT macro" into main am: 9c562cf82b
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2759565
Change-Id: I8e9399915ad0b69618163a2d0d5a719e57700efd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 18:39:58 +00:00
Treehugger Robot
9c562cf82b
Merge "Delete unused DATA_MNT_POINT macro" into main
2023-09-21 17:33:28 +00:00
Andrew Scull
f06e218e82
Delete unused DATA_MNT_POINT macro
...
The macros isn't used anywhere but was a distraction when tracking down
/data mounting behaviour.
Test: build
Change-Id: Ie23574326cbebd7f515c8409e1dcb91a00cafc6f
2023-09-21 14:50:55 +00:00
Treehugger Robot
d9e8e5665a
Merge "Remove unnecessary keyword setting" into main am: fad3b2fbad
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2754910
Change-Id: I4963f8ef1904fc487beddf65eb7d1b20965c6987
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 22:57:16 +00:00
Treehugger Robot
fad3b2fbad
Merge "Remove unnecessary keyword setting" into main
2023-09-20 22:25:07 +00:00
Dan Shi
1b51ffb4e4
Merge "Move CF only tests to CF test mapping suite" into main am: 19224ed589
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2754947
Change-Id: I8517d5ca5b4982a05681462d24933959057dd865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 21:12:30 +00:00
Dan Shi
43c87b3291
Remove unnecessary keyword setting
...
These 2 tests can run on aosp cf.
Bug: 300519349
Test: atest presubmit check
Change-Id: I8ee41c2abe464be2c2ee4537de5edf86308183aa
2023-09-20 13:26:18 -07:00
Dan Shi
19224ed589
Merge "Move CF only tests to CF test mapping suite" into main
2023-09-20 20:20:35 +00:00
Dan Shi
a95ed0aeac
Move CF only tests to CF test mapping suite
...
This change doesn't modify presubmit coverage, the tests will still
run in the lab as test mapping suite, just on a different ATP test
config that dedicated to tests can only run on CF (not aosp_cf), on
git_main branch.
Bug: 300519349
Test: atest presubmit check
Change-Id: Ib179c034dc58f8d8a763d374af0d103baf51343b
2023-09-20 18:27:43 +00:00
Tomasz Wasilczyk
ed26eba982
Merge "Don't depend on String8 cast to C string" into main am: 24636e4e30
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2748674
Change-Id: I71dd71eb6269f4be22488ab2b58e4cc5b47c8b74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 17:37:43 +00:00
Tomasz Wasilczyk
24636e4e30
Merge "Don't depend on String8 cast to C string" into main
2023-09-20 17:02:45 +00:00
Elliott Hughes
be175c3af6
Merge "arm64: update the "minimum maximum" comment." into main am: cc8d909ccb
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2755786
Change-Id: I70bf4e5a0fa4f1f4c969af72be36734f44163c2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 16:45:08 +00:00
Elliott Hughes
cc8d909ccb
Merge "arm64: update the "minimum maximum" comment." into main
2023-09-20 15:55:18 +00:00
Tomasz Wasilczyk
2b1a0599c4
Don't depend on String8 cast to C string
...
Bug: 295394788
Test: m checkbuild
Change-Id: I5b86ae56250d409a23ab3f2bc72b725bcf6ab23e
2023-09-20 15:11:54 +00:00