Commit graph

89666 commits

Author SHA1 Message Date
Liana Kazanova
bd153e76db Revert "Migrate init.environ.rc module to Soong"
Revert submission 3197177-init_environ_rc_soong

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

Reverted changes: /q/submissionid:3197177-init_environ_rc_soong

Change-Id: I3834d7f76f4baef747f3536167ad9bd2d2a474b4
2024-07-31 17:56:36 +00:00
Inseob Kim
fcbb743d86 Migrate init.environ.rc module to Soong
Makefile module still remains to handle post install commands. We're
going to move that to somewhere else as a followup.

Bug: 353429422
Test: boot with and without USE_SOONG_DEFINED_SYSTEM_IMAGE
Change-Id: I85ec048e6e57981ad4496ea90762aa34bd9a5ca1
2024-07-31 13:10:41 +09:00
Chaitanya Cheemala (xWF)
4d73a9d9ad Merge "Revert "Set block device as RO/RW before mount"" into main 2024-07-30 09:47:57 +00:00
Chaitanya Cheemala (xWF)
1f00f794e6 Revert "Set block device as RO/RW before mount"
This reverts commit c6dfdbb761.

Reason for revert: Likely culprit for b/356319388  - 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: Ibd85b26a02f0278676f330c6825d3cb15eefe3fc
2024-07-30 09:05:17 +00:00
Treehugger Robot
785961673b Merge "Set block device as RO/RW before mount" into main 2024-07-30 04:06:38 +00:00
Treehugger Robot
69c7daf1a7 Merge "Add trusty_rkp_set_uds_cert for UdsCert provisioning" into main 2024-07-29 15:53:54 +00:00
Daniel Zheng
ed25450792 Merge "libsnapshot: add test for merge_size param" into main 2024-07-25 04:23:03 +00:00
Daniel Zheng
11f08531f9 Merge "libsnapshot: cap merge op count" into main 2024-07-25 04:22:51 +00:00
Daniel Zheng
39fe6e1d38 libsnapshot: add test for merge_size param
Add test to make sure that setting the protobuf successfully propogates
the gflag argument to snapuserd_handler.

Bug: 332255580
Test: th
Change-Id: Ic7a008bee7dd3ca29faa0a5409f0513f1551bf37
2024-07-24 15:21:51 -07:00
Daniel Zheng
1fbba3ed0d libsnapshot: cap merge op count
Set op processing window during snapshot merge from the build. The lower
the merge count, the lower the memory strain during the merge process

Bug: 332255580
Test: verify merge_size propogates to snapuserd daemon
Change-Id: Ic7770115bca963d923a7a276897c5deac30f9faf
2024-07-24 15:19:43 -07:00
Treehugger Robot
f2c1d4e7bf Merge "charger: fix show qustion mark when start to draw UI" into main 2024-07-24 02:58:16 +00:00
Tommy Chiu
5c1378a5ff Add trusty_rkp_set_uds_cert for UdsCert provisioning
Bug: 330791928
Test: trusty_rkp_set_uds_cert /data/rkp_uds_cert_test.xml
Change-Id: I368be346197099ff6d3fe7a09d666791faada040
2024-07-23 15:41:45 +00:00
Jiyong Park
b6b55fc945 Merge "Update visibility according to the change AVF directories layout" into main 2024-07-23 07:21:23 +00:00
Treehugger Robot
0c76dcb89a Merge "Add adb-remount-sh to presubmit & kernel-presubmit group." into main 2024-07-23 02:53:09 +00:00
Akilesh Kailash
30b3d9e62c Merge changes I6826b287,Ia8e6db89 into main
* changes:
  Skip tests if vendor partition is on Android S
  libsnapshot: Address GRF config when updating from Android S config
2024-07-22 20:05:07 +00:00
Akilesh Kailash
6906249312 Skip tests if vendor partition is on Android S
Bug: 349278999
Test: vts_libsnapshot_test on GSI config
Change-Id: I6826b287565e8a78bea21b4830ad30f1c30a01bf
Signed-off-by: Akilesh Kailash <akailash@google.com>
2024-07-22 10:32:56 -07:00
Betty Zhou
3360d387d2 Add adb-remount-sh to presubmit & kernel-presubmit group.
Test: test-mapping test
Bug: 231996550
Change-Id: Ic03dcf8c316e64bc5d6b106b598c0af590d24802
2024-07-22 17:24:51 +00:00
Akilesh Kailash
1b76cb48ef libsnapshot: Address GRF config when updating from Android S config
Bug: 333854394
Test: 1)S+U > V+V , FULL OTA pass
2)S+U > S+V, FULL OTA pass
Change-Id: Ia8e6db89c3395930856ace8940424e60cae92375
Signed-off-by: Akilesh Kailash <akailash@google.com>
2024-07-22 10:18:30 -07:00
Jack Wu
4363e8c3a7 charger: fix show qustion mark when start to draw UI
skip drawing UI if battery status is not ready.

Bug: 343093322
Test: confirm offmode charge UI behavior
Change-Id: Ic5ed4577502bea22f693b7ec0b577dc25ba24712
Signed-off-by: Jack Wu <wjack@google.com>
2024-07-22 20:06:25 +08:00
Treehugger Robot
d909570786 Merge "init: set a new trigger when a vold checkpoint is committed" into main 2024-07-22 09:12:29 +00:00
Jiyong Park
d959fc72c1 Update visibility according to the change AVF directories layout
Bug: 352458998
Test: m nothing
Change-Id: Ibdae7e76a66104cc644b7f82059a2dc5f08659d0
2024-07-22 11:24:03 +09:00
Mike McTernan
007224d5ee Merge "storageproxy: set a property when secure storage becomes rw" into main 2024-07-19 19:09:25 +00:00
Mike McTernan
b525463558 init: set a new trigger when a vold checkpoint is committed
Add post-fs-data-checkpointed trigger when vold completes checkpointing
after an OTA update.

Bug: 350362101
Test: ABTD
Change-Id: I647a73a942174015b46c5f40bd8f8d3347977ecd
2024-07-19 16:40:23 +00:00
Treehugger Robot
e2274762ea Merge "Add debug logs to understand slow update start issue" into main 2024-07-18 20:03:55 +00:00
Kelvin Zhang
4edd685de6 Merge "fs_mgr: libfstab: allow recovery.fstab with suffix" into main 2024-07-18 16:23:45 +00:00
Kelvin Zhang
c6dfdbb761 Set block device as RO/RW before mount
umount is faster if an RO mount is on top of an RO block device.

Test: th
Bug: 349507086
Change-Id: I621cafd5b15c2c4e104ae7678a1bcf2588fe29b6
2024-07-18 09:13:48 -07:00
Kelvin Zhang
47a95af84f Add debug logs to understand slow update start issue
Test: th
Bug: 352332753
Change-Id: I2d8f99217722479dcae2e2ea0f74bbf112725ce2
2024-07-18 09:13:48 -07:00
Mike McTernan
9c77e66d56 storageproxy: set a property when secure storage becomes rw
Bug: 350362101
Test: ABTD
Change-Id: I877a62e5c6337f31ffe63a4fd3cdeb54b69a8ae6
2024-07-18 14:41:43 +01:00
Treehugger Robot
196a802384 Merge "Convert asan.options and asan_extract to Android.bp" into main 2024-07-18 05:26:06 +00:00
Treehugger Robot
4b966aa749 Merge "Convert *-developer-gsi.avbpubkey to Android.bp" into main 2024-07-18 00:44:49 +00:00
Kelvin Zhang
1746835051 Merge "Log lock time if it takes too long" into main 2024-07-17 23:32:37 +00:00
Kelvin Zhang
1315ca7b06 Log lock time if it takes too long
Test: th
Bug: 352332753
Change-Id: Ie7397f7027a597cebb33206a6df845918bc3dab5
2024-07-17 14:49:28 -07:00
Nelson Li
b335f4d4be Convert asan.options and asan_extract to Android.bp
In the original Android.mk, `asan.option` is only enabled when
"address" is present in SANITIZE_TARGET.
`asan_extract` is only enabled when `SANITIZE_TARGET_SYSTEM` is `true`
and `address` is present in SANITIZE_TARGET.

However, in the normal build system design, a module should `not`
decide when it should be enabled.
Therefore, the `ifeq` condition should be directly removed during
conversion.

The correct approach is:
Wait until converting `init.environ.rc`, then use `select` or similar
methods to determine whether it should use `asan.option` or
`asan_extract`.

Bug: 353164536
Test: SANITIZE_TARGET=address m init.environ.rc
      SANITIZE_TARGET_SYSTEM=true SANITIZE_TARGET=address m init.environ.rc
Change-Id: I69af3199536a3ba9f54dcfa198295826303e2d22
2024-07-17 14:50:16 +08:00
Nelson Li
2c2f3294b7 Convert *-developer-gsi.avbpubkey to Android.bp
Use `soong_config_module_type` to install `*-developer-gsi.avbpubkey`
to either `ramdisk` or `vendor_ramdisk` based on the value of
`BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT` in each device.

In build/soong/android/paths.go's modulePartition() function, there is
already logic to construct `vendor_ramdisk` and `ramdisk` partitions
based on the different values of
`BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT` and
`BOARD_USES_RECOVERY_AS_BOOT`. And the logic is identical to the
original Android.mk.

Therefore, this change only needs to determine whether the avb public
keys should be placed in `vendor_ramdisk` or `ramdisk` based on the
value of `BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT`. The rest of the
judgment logic can be ignored.

Bug: 347636127
Test: 1) lunch aosp_cf_x86_64_phone && m q-developer-gsi.avbpubkey
      2) check it installed to vendor_ramdisk/first_stage_ramdisk/avb/
      3) lunch yukawa && m q-developer-gsi.avbpubkey
      4) check it installed to ramdisk/avb/q-developer-gsi.avbpubkey
Change-Id: I6de1a038261f2feeae4504d8097c7392b166848d
2024-07-17 13:34:46 +08:00
Treehugger Robot
c36f4f057b Merge "init: Support for initializing virtio-console devices" into main 2024-07-16 02:25:43 +00:00
Christopher Ferris
13cb70601e Merge "Remove usage of ATOMIC_VAR_INIT." into main 2024-07-12 18:44:55 +00:00
Treehugger Robot
291724b621 Merge "Add debug logs to understand update start delay" into main 2024-07-12 18:42:02 +00:00
Ahmad Chaudhry
22a683c7aa fs_mgr: libfstab: allow recovery.fstab with suffix
Some platforms may need different fstab configs.
Accordingly, allow recovery init to select
a recovery.fstab with a suffix provided through
bootconfigs or cmdline during runtime,
to make a single recovery.img work on different
environments.

Change-Id: I0c2f61ffe9ddeb03afc54d8acc43b4917d65b846
2024-07-12 16:21:01 +00:00
Ryan Prichard
3468a90f47 Merge changes Id338f439,Ic7f50453 into main
* changes:
  bootstat: avoid vector<const T>
  fs_mgr: avoid vector<const T>
2024-07-12 00:47:42 +00:00
Christopher Ferris
a3a6c8e052 Remove usage of ATOMIC_VAR_INIT.
The use of the macro ATOMIC_VAR_INIT is not necessary and is causing
warnings about it being deprecated. So remove it.

Test: Compiles without any warnings.
Change-Id: I137ffd0a7cf9a24c2c7ddea5c30f310722f57b98
2024-07-11 23:54:48 +00:00
Kelvin Zhang
4d1894abc4 Add debug logs to understand update start delay
Test: th
Bug: 352332753
Change-Id: I7c8f11409dc2a1312813b29a4c523b3fe17833c4
2024-07-11 09:53:23 -07:00
Tiffany Yang
0fb39f6e69 init: Support for initializing virtio-console devices
This change allows init to ensure that a specified virtio-console
device file (`/dev/hvc*`) is available before `ueventd` coldboot.
Times out if device path is not encountered within 10 seconds.

Bug: 325538592
Test: build bertha_x86_64 and bertha_arm64
Change-Id: Ia1512e69ea607bf4d235595caa53668e2dac500c
2024-07-10 18:59:44 -07:00
Akilesh Kailash
60d8d17fbc Merge "snapuserd_test: Create dup of fd before passing it to cow writer" into main 2024-07-10 23:57:50 +00:00
Akilesh Kailash
453665b5f5 snapuserd_test: Create dup of fd before passing it to cow writer
Bug: 352085551
Test: snapuserd_test - atest 10 iterations passed
Change-Id: I25549e546cb3ce234fcf92533effb124793f1953
Signed-off-by: Akilesh Kailash <akailash@google.com>
2024-07-10 15:22:21 +00:00
Julie Pan
73c43fd586 Merge "Remove alanstokes@google.com from mini_keyctl/OWNERS" into main 2024-07-09 22:17:11 +00:00
Owner Cleanup Bot
8896d29c5f Remove alanstokes@google.com from mini_keyctl/OWNERS
This suggested change is automatically generated based on group
memberships and affiliations.
If this change is unnecessary or in error, vote the lowest CR value
(i.e. reject the CL) and the bot will abandon it. Vote the highest CR to
approve this change. You may also abandon this change.

See the owner's recent activity for context:
https://android-review.googlesource.com/q/alanstokes@google.com

To report an issue, file a bug in the Infra>Codereview component.

Change-Id: I1b8637979a8206e6f8d1e56a7a9a4c84b7896739
2024-07-09 21:12:32 +00:00
Hans Boehm
1b251d441e Merge "Make timeout messages distinct" into main 2024-07-08 18:19:33 +00:00
Jiyong Park
e563c3f48a Merge "Use no_full_install: true instead of installable: false" into main 2024-07-04 00:37:39 +00:00
Hans Boehm
d9d7f7a8c3 Make timeout messages distinct
... so that we can confirm that it's actually the poll() call that's
timing out.

Bug: 332593241
Test: Treehugger
Change-Id: I529be76a268d7ba1f7f26a953eb84945f3ac4924
2024-07-03 17:33:08 -07:00
Jiyong Park
0bdd68bb06 Use no_full_install: true instead of installable: false
This is a follow-up on I37380c19232f2c497bdf492a83cdc16616f0ae8d.

Bug: 338160898
Bug: 345110999
Test: Microdroid boots even with BOARD_USES_RECOVERY_AS_BOOT
Change-Id: I41c1e40aeaffd5499fb6bd25e80b5be83470bc6b
2024-07-03 18:42:59 +09:00