Commit graph

84452 commits

Author SHA1 Message Date
Hsin-Yi Chen
9fa3941217 Merge "Check the ABI of libutils for vendor and product only" into main am: c2b4411b43
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2736196

Change-Id: I15ebfdda7d7f4ba338432e679fb7ac2faef702cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 03:20:58 +00:00
Hsin-Yi Chen
c2b4411b43 Merge "Check the ABI of libutils for vendor and product only" into main 2023-09-06 02:43:32 +00:00
Thiébaud Weksteen
50f03fd58e Revert "Use Apex sepolicy if it's available"
This reverts commit baeece6d0c.

Test: boot aosp_cf_x86_64_phone-userdebug
Bug: 297794885
Change-Id: I0515bc30eba42589c407deb587684b4da011aead
2023-09-06 10:52:49 +10:00
Chun-Wei Wang
8eb1e5ad6e Merge "Add a fastboot command to show GSI status" into main am: 62051237a2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2735077

Change-Id: I4174c0ccc2e5fcb308959458b2ed63a979017aef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 22:42:26 +00:00
Akilesh Kailash
214d62e3f7 create_snapshot: Create snapshot patch comparing two partition images
This is a host based tool wherein it compares two Android images and generates snapshot patches which are similar to Android OTA format.

There are few advantages:

1: All the computation of snapshot logic is pushed onto the host.
2: Each partition can have different compression algorithm.
3: All the libsnapshot_cow changes can be tested very quickly.

Here is the test run. This compares two builds which are 24 hours apart.

```

create_snapshot --source=$ANDROID_PRODUCT_OUT/system.img --target=./images/system.img --compression="zstd" &
create_snapshot --source=$ANDROID_PRODUCT_OUT/product.img --target=./images/product.img --compression="lz4" &
create_snapshot --source=$ANDROID_PRODUCT_OUT/vendor.img --target=./images/vendor.img &
create_snapshot --source=$ANDROID_PRODUCT_OUT/system_ext.img --target=./images/system_ext.img --compression="gz" &
create_snapshot --source=$ANDROID_PRODUCT_OUT/vendor_dlkm.img --target=./images/vendor_dlkm.img &

echo "Waiting for snapshot patch creation"
wait $(jobs -p)
echo "Snapshot patch creation completed"
```

========================================
Waiting for snapshot patch creation
Snapshot patch: vendor_dlkm.patch created successfully
Snapshot patch: vendor.patch created successfully
Snapshot patch: system_ext.patch created successfully
Snapshot patch: product.patch created successfully
Snapshot patch: system.patch created successfully
Snapshot patch creation completed

real	0m3.848s
user	0m14.239s
sys	0m8.045s
========================================

It takes ~4 seconds to generate the snapshot patches on the host. Snapshot patches are named as <partition-name>.patch.

Bug: 299011882
Test: create_snapshot between two builds as mentioned above.
Change-Id: Ic87dd3349a866b5626fa03f1f879f417a8116cc2
Signed-off-by: Akilesh Kailash <akailash@google.com>
2023-09-05 15:42:11 -07:00
Chun-Wei Wang
62051237a2 Merge "Add a fastboot command to show GSI status" into main 2023-09-05 22:18:40 +00:00
Treehugger Robot
1598c5f4d9 Merge "Skip UP1A.230905.019" into aosp-main-future 2023-09-05 19:54:48 +00:00
Andrei Diea
e3bda36e0b debuggerd: add socksetopt to seccomp policy
aosp/2734054 added socket timeouts for nonblocking liblog ops.
seccomp policy was not updated so tests failed when unallowed
socksetopt syscall was made.

Bug: 298420226
Test: atest debuggerd_test

Change-Id: Iace232ec8b94e5d316d344abc5d866fe314607e0
Signed-off-by: Andrei Diea <adiea@google.com>
2023-09-05 19:29:13 +00:00
Chun-Wei Wang
671a2a551a Add a fastboot command to show GSI status
The command will be used by RMA tool to skip
device wiping when it is already in GSI mode.

This change also makes it easier to add more
gsi commands in the future without needing to
update the host side tool (fastboot).

Bug: 298130522
Bug: 298138572
Test: 1. reboot into fastboot mode
      2. fastboot gsi status
Change-Id: Ic81f89a93b854f9ec70aebe2d209bfd1f98e3645
2023-09-05 23:31:01 +08:00
Dmitrii Merkurev
dec9caf1cc Merge "fastboot: get rid of manual transport memory management" into main am: f667b6d8ba
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2736776

Change-Id: Icf0624a7ee50d493c4a2e5a7417d9918fae411ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 14:42:30 +00:00
Dmitrii Merkurev
f667b6d8ba Merge "fastboot: get rid of manual transport memory management" into main 2023-09-05 14:04:54 +00:00
Thiébaud Weksteen
baced3df83 Merge "Remove SeamendcHostTest from TEST_MAPPING" into main am: 9fb6b49131
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2735076

Change-Id: I65ef081ba994aa4d36392d3eccbfe1f79d930845
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 06:15:32 +00:00
Thiébaud Weksteen
9fb6b49131 Merge "Remove SeamendcHostTest from TEST_MAPPING" into main 2023-09-05 05:10:01 +00:00
Hsin-Yi Chen
e474f21a45 Check the ABI of libutils for vendor and product only
It is not necessary to compare the dumps with the library installed in
system partition.

Test: m out/target/product/generic_x86_64/lsdump_paths.txt
Bug: 280008249
Change-Id: I8fc39ad17d37cd43bf1d77ba23dde55d05dadce1
2023-09-04 03:38:15 +00:00
Dmitrii Merkurev
0b627d92c4 fastboot: get rid of manual transport memory management
Existing code has transport memory leaks. Use smart pointers
for transport to get rid of those cases and manual memory
management

Test: atest fastboot_test
Test: manually checked transport isn't leaking anymore
Bug: 296629925
Change-Id: Ifdf162d5084f61ae5c1d2b56a897464af58100da
Signed-off-by: Dmitrii Merkurev <dimorinny@google.com>
2023-09-03 17:30:46 +01:00
Treehugger Robot
149bfa5bdf Merge "Ignore 16K kernel modules when running on 4K kernel" into main am: a5c51c9cee
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2726056

Change-Id: Idd2c213430b70a928b11cfcde31b6c0c3fe02f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 22:19:08 +00:00
Treehugger Robot
a5c51c9cee Merge "Ignore 16K kernel modules when running on 4K kernel" into main 2023-09-01 21:27:25 +00:00
Kelvin Zhang
dba385edda Ignore 16K kernel modules when running on 4K kernel
Test: th
Bug: 293313353
Change-Id: I02ea01c8e67b9ded164c7492eea3be0aead75de1
2023-09-01 09:55:35 -07:00
Xin Li
0340240080 Skip UP1A.230905.019
Merged-In: I28491e90847f6aa0c9767b27e1d99190637048b9
Change-Id: I0b97f049bde020589a6212a74a090c969fed57aa
2023-08-31 14:31:52 -07:00
Thiébaud Weksteen
18ff56d8d7 Remove SeamendcHostTest from TEST_MAPPING
Bug: 297794885
Test: TH
Change-Id: I49c6caa575ccd570085de15ddf51ea9a71abe90f
2023-08-31 14:22:48 +10:00
Daniel Zheng
afe1163ade Adding test for IsDynamicPartition
Adding a test case for checking if flash task is a dynamic partition
flash task. This function is used since is-logical only works in
fastbootd, and should_flash_in_userspace() only works if
$ANDROID_PRODUCT_OUT is set. This function works with fastboot update
when called in bootloader without $OUT dir set

Test: fastboot_test
Change-Id: I65309f97e04fdfc449e61de5cd3a6feff18bc9ab
2023-08-30 12:59:29 -07:00
Daniel Zheng
2d4261ca43 documenting optimized flash super
Adding documentation on the explicit pattern match we are going to add
to optimizing flash super.

Test: na
Change-Id: I57c19fb2a85d74beea5b91e38f6f46fa47637117
2023-08-30 12:59:27 -07:00
Daniel Zheng
1fff690c18 Adding testing for optimized flash super
Adding test cases for correct formation of optimized flash super task.
We are adding an explicit pattern match for this task to be correctly
formed. Changing Optimized flash task to only remove the reboot to
userspace as a user might want to reboot back to bootloader after
flashing. We also need to change a couple functions to take a
IFastbootDriver to mock up the initialization path.

Test: fastboot_test
Bug: 297085098
Change-Id: Ic5c63bd4057ca6d64647134e5ce33fef12077fdb
2023-08-30 12:59:26 -07:00
Daniel Zheng
e15c9ac64f Merge "Fixing optimization logic" into main am: 09a61fad87
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2726539

Change-Id: Ib1747dfcba4cf5a9109c2f426a95ababc05e927b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 18:23:03 +00:00
Daniel Zheng
09a61fad87 Merge "Fixing optimization logic" into main 2023-08-30 17:46:44 +00:00
Daniel Zheng
1ef66b70ff Fixing optimization logic
Adding a hard pattern check for optimized task formation. To keep
behavior consistent, we will remove the old initialization path and add
resize tasks after attempting optimization.

Test: fastboot_test
Bug: 297085098
Change-Id: Ie0e656af9be7abdd130290fe547ffbf385ce75d6
2023-08-30 09:39:30 -07:00
David Anderson
b8cf4b820f Merge "snapuserd: Add snapuserd_test to presubmit and VTS." into main am: 5b91ae9f4e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2698913

Change-Id: Ia766fe856c9f507def6a4912f05a85c1c0c89631
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 23:12:42 +00:00
David Anderson
5b91ae9f4e Merge "snapuserd: Add snapuserd_test to presubmit and VTS." into main 2023-08-29 22:10:27 +00:00
Xin Li
fcae454545 Merge "Merge Android U (ab/10368041)" into aosp-main-future 2023-08-28 22:12:53 +00:00
Treehugger Robot
f148dbb40d Merge "Make simg2img host-only" into main am: 5aa25bf3ae
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2727087

Change-Id: Iafb0bb217f3c72d579c90cb0a8b005ce877ec1b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 18:35:38 +00:00
Treehugger Robot
5aa25bf3ae Merge "Make simg2img host-only" into main 2023-08-28 17:44:24 +00:00
Cole Faust
81c4e225bf Make simg2img host-only
This is supposed to be a host tool, but was being installed on
cuttlefish devices.

Bug: 205632228
Test: Presubmits
Change-Id: I9eb1ae1a5c171253617fa12283e2ec651afb5539
2023-08-28 09:53:30 -07:00
Xin Li
4484eb1bfd Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: I849958d9e9de3be48e32f57acc7b3526e184482c
Change-Id: Ic765b54aa981b6370b5dff6b4cf046bbe9fbdbaf
2023-08-25 13:54:47 -07:00
Treehugger Robot
0bb51f7606 Merge "Migrate from android::String isEmpty to empty" into main am: 18560efc30
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2705823

Change-Id: I0e36482d480ab8396c42095239e88f560f4d1d99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 17:41:56 +00:00
Treehugger Robot
18560efc30 Merge "Migrate from android::String isEmpty to empty" into main 2023-08-25 17:07:42 +00:00
David Anderson
9077049910 Merge "snapuserd: Fix race condition in MergeWorker::WaitForMergeBegin." into main am: c718295a58
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2701653

Change-Id: I62acd8492c2e2761584f2490c8b2db27dcfe3838
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 17:01:19 +00:00
David Anderson
c718295a58 Merge "snapuserd: Fix race condition in MergeWorker::WaitForMergeBegin." into main 2023-08-25 16:09:35 +00:00
Snehal Koukuntla
17a2bf47b6 Merge "Add UUIDs to profraw filenames" into main am: c174f14617
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2706079

Change-Id: I312a8d2833acc4e89e5974f30e0d8226dafc2642
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 14:56:05 +00:00
Snehal Koukuntla
c174f14617 Merge "Add UUIDs to profraw filenames" into main 2023-08-25 14:21:23 +00:00
Treehugger Robot
0b3c8ca0b2 Merge "Increase the number of service supplementary group" into main am: 89b4f96d50
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2727414

Change-Id: Ied5f18880bfdc7cc29a975378e6265df9a598a10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 10:05:50 +00:00
Treehugger Robot
89b4f96d50 Merge "Increase the number of service supplementary group" into main 2023-08-25 09:37:25 +00:00
Yinchu Chen
3343ca2380 Increase the number of service supplementary group
OEM can add self-owned groups, but the system init cannot support if the group numbers are over than 12, relax some restrictions as appropriate.

Bug: b/296826987

Signed-off-by: Haichao Li <liuhc3@motorola.com>
Change-Id: I231d9f6c82e93c08bc97ca32df70e5b28760acbc
2023-08-25 04:24:48 +00:00
Tomasz Wasilczyk
80738a1e0b Merge "Implement String8|16::empty and String16::length" into main am: 9578c774a9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2705822

Change-Id: If14f11f1ec862554e698f443195751b8a997eba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 19:28:24 +00:00
Tomasz Wasilczyk
9578c774a9 Merge "Implement String8|16::empty and String16::length" into main 2023-08-24 18:31:56 +00:00
Tomasz Wasilczyk
5ba379817d Merge "Lose convertToResPath to aapt." into main am: 92ad0d32c0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1764798

Change-Id: I8d3aa01961aae5760f5c476014deeaea516e6bd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 17:23:48 +00:00
Tomasz Wasilczyk
92ad0d32c0 Merge "Lose convertToResPath to aapt." into main 2023-08-24 16:46:49 +00:00
Treehugger Robot
0168cc256a Merge "Update bug component from Android Systems to OTA client" into main am: c728c39121
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2719636

Change-Id: I42b8305056a3e9b153b6f8d44808b5dc5092da45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 11:32:12 +00:00
Treehugger Robot
c728c39121 Merge "Update bug component from Android Systems to OTA client" into main 2023-08-24 11:13:12 +00:00
Elliott Hughes
1d98fe0d39 Lose convertToResPath to aapt.
aapt (not aapt2) is the only user.

Test: treehugger
Change-Id: Ie69f84f4f805c69f838e345b44755a316b9f9b06
2023-08-24 04:33:05 +00:00
Treehugger Robot
68c2432f77 Merge "Drop String::empty()" into main am: 47fc3df9a0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2707114

Change-Id: If551ac01d8dcfc5862888b561f3a99a01c1f6540
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 04:21:44 +00:00