Commit graph

90574 commits

Author SHA1 Message Date
Michael Bestas
5860c0fa2e Android 15.0.0 Release 14 (AP4A.250205.002)
-----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ6KKkQAKCRDorT+BmrEO
 eJGvAJ9LFzDH9Bc8ZfcBE7rlzaCpbSgoJQCeImt0uAic0coI65/qnUCfwUwToQw=
 =vwD5
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN SSH SIGNATURE-----
 U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgPpdpjxPACTIhnlvYz0GM4BR7FJ
 +rYv3jMbfxNKD3JvcAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5
 AAAAQOt1n2ljmJJ/zGJRHaumnlZjhGgYEH4sJkTH+G+JWCLPBB0rIL9zg1BrV9wn6i/E0R
 8RNbXocUAHUF5AqZ/RcQc=
 -----END SSH SIGNATURE-----

Merge tag 'android-15.0.0_r14' into staging/lineage-22.1_merge-android-15.0.0_r14

Android 15.0.0 Release 14 (AP4A.250205.002)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ6KKkQAKCRDorT+BmrEO
# eJGvAJ9LFzDH9Bc8ZfcBE7rlzaCpbSgoJQCeImt0uAic0coI65/qnUCfwUwToQw=
# =vwD5
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Feb  4 23:45:53 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

# By David Anderson
# Via Android Build Coastguard Worker
* tag 'android-15.0.0_r14':
  libdm: Redact keys from dm-crypt targets when calling GetTable.

Change-Id: I88baf10a62473ef584efbcce461dc0149ee138f4
2025-02-05 17:53:13 +02:00
Android Build Coastguard Worker
32ecbe3713 Merge cherrypicks of ['googleplex-android-review.googlesource.com/29653198'] into 24Q4-release.
Change-Id: I1aaaba2d463d0b12e170a745188a96a2a96cc875
2024-12-18 08:34:10 -08:00
David Anderson
a536f79a5f libdm: Redact keys from dm-crypt targets when calling GetTable.
Ignore-AOSP-First: security fix
Bug: 368069390
Test: libdm_test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bc067ef9f0408f3b7c4f5dcae3b6aec51f386e4d)
Merged-In: I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d
Change-Id: I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d
2024-12-18 08:27:15 -08:00
Michael Bestas
ffe39e16d3 Android 15.0.0 Release 6 (AP4A.241205.013)
-----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IsswAKCRDorT+BmrEO
 eHLxAJ9VFRJgjolHUwxeYIHRrAxp7WFw0wCeIiUvtF763IeQx6Ri6gz3/i1V9mY=
 =uE+H
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmdYsU0XHG1rYmVzdGFz
 QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+ZmlzEhAAkyT+qSieZv1roFs6MW0sBnjP
 60eSCsj/eVetsK91ExBdm+NPHmpFG1XUcwxxiWzlPweIYA+eaECdoP9qngwxH/fy
 7m6lxzVx2C9JbSCRWuBmyFWfsm7l+cjDoO8a5QnummBNobhV6/z680+CPzhsXXp5
 wQ8cRYLlZEwSMGlgW5KufhbEQISZK1rxWGcx7C0MwoAZybm0V7bcv9ot9XWVZdBI
 0uvpZEAYuLqMTTOxd1HNZBKA+cMmWLE+0ALfydGqdHxTkpDXY17Ek4/R3H7KTcy0
 mhp6rLQHMKn/atDUsYGvDp/wGs+PWHl9QPXprwj9g9XBNRaAcw/ANi+I/Gc17Qsc
 X/5DeC0ycGBljhjnl7ZoXAPwLyN+tYZi+ekwBs0E4+uQCLG5AMSLGZHGHcZafXB1
 s0pR1u85BxC/7CoVB22J5utjsLdJT0G8bIgfyrKVVIA9iIe9zO/rsMN+9kffrQ9W
 xPohc1XyVrsQ2b6xk/PyqbAI5mk7+IKKhxhX+Vv2Fczp2OCPuefa1aS1lIv4bZBL
 rRPlVyodLWsEqxGNhiCo5Hh24uufJGuBTL2w6Rn5/UkqUkvUQZbsRNTg7WQIfcWh
 sNvuNNxpgsilXFJC0/aoLE557MjCWq4eolPLnyrz3yR3jPcAa269bMuiMXKsVeEd
 PvjxgQawPY8QkE2woe0=
 =R9aC
 -----END PGP SIGNATURE-----

Merge tag 'android-15.0.0_r6' into staging/lineage-22.0_merge-android-15.0.0_r6

Android 15.0.0 Release 6 (AP4A.241205.013)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IsswAKCRDorT+BmrEO
# eHLxAJ9VFRJgjolHUwxeYIHRrAxp7WFw0wCeIiUvtF763IeQx6Ri6gz3/i1V9mY=
# =uE+H
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Dec  6 00:44:03 2024 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2481 signatures in the past
#      3 years.  Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Akilesh Kailash (13) and others
# Via Automerger Merge Worker (317) and others
* tag 'android-15.0.0_r6': (158 commits)
  trusty: storage: proxy: FS_READY property setting on vendor only
  Fix the trigger name for loading bpf programs.
  start netd earlier
  Replace base::RandInt with std::uniform_int_distribution
  trusty: keymint: rename trusty_ipc_dev property
  Move the `dist` target of `mke2fs` to `build/core/tasks`
  Remove define of SA_EXPOSE_TAGBITS.
  Add input event profile to mitigate input latency of input threads
  Remove usage of base/string/* in libfs_avb
  Add getFdStateDebug to access Looper's callbacks
  libsnapshot: CHECK -> CHECK_EQ
  Mount /mnt/vm earlier
  Define linker.config.json as a filegroup
  Remove usage of base/logging.h in libfs_avb
  debuggerd: recognize jumps to non-executable memory.
  Support vendor partition in non-debuggable pVMs
  Remind the reader that they'll need to modify CTS too.
  Rename system/core/rootdir/Android.mk to create_root_structure.mk
  trusty: keymint/gatekeeper: Pass device name from init scripts
  Remove unused variable.
  ...

 Conflicts:
	fs_mgr/libsnapshot/include/libsnapshot/snapshot.h
	fs_mgr/libsnapshot/snapshot.cpp
	init/Android.bp
	init/fuzzer/Android.bp

Change-Id: I29c07b3ac76940cb2b82726e98d2beb643b3e6e4
2024-12-10 23:23:24 +02:00
Yumi Yukimura
409de40ac2 fs_mgr: Get additional supported fs from prop in recovery
Change-Id: I73ad8e92fe3dc1f402694579c1931c9a02dc908f
2024-11-23 15:49:42 +08:00
Yumi Yukimura
78e10dfc1b Revert "fs_mgr: Add virtiofs to supported fs list"
This reverts commit 79f7132bc3.

Change-Id: Id0e419bb2c74b048d58d24b3cdfb8bf3c5f03947
2024-11-23 15:49:42 +08:00
Michael Bestas
3f2d09e4b0 Android 15.0.0 release 5
-----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZyveowAKCRDorT+BmrEO
 eEowAJ0Ut5Tkq4TVDFvrYySEynb9v8QVIQCfSPhFnaHGbSQiqBRHrEdNbZJQS3s=
 =vYsf
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmcstXAXHG1rYmVzdGFz
 QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+ZmkWQQ//TxtLkYx/axq6FjdEX+/O98Ug
 SKaMooXZZ+fukX3ZwDCeoqwzJyb/Yho+TdqIE6wtzJsdP79xgeeYofBV+fsTUyTG
 tgjo/3fIbzpL8IjhxiJrJZdH4yVI7QxhK23Nfk91fvwwqm+XE9bPaiXPFkL1boSV
 E25OGizCucqWXeY9zoHWTx3F1HeGx2uG/+2p7BZxwP/jbFsnHWrvnUlwTWi3NHz+
 KnLCcgd6m1ZPuf141Od3rKPhkuPxEH3Ed3I1bWT+QebI+YvgIuVELdy2MNaDW+JH
 iOwEqk9IHSDEQJ3jV1WO50dyRUsDej4ihCHe2bZgEe1Nhv8d5f1MhcnJs/S/I9tf
 7A1zVcktKpSjrZjv7aFdlxr5oQvPT+OH9XgJqIfajadoaVGk+wnc0fPJwvH9/eUA
 thmKvxToKJYJ+7DsODidOgJd6M0JsaHrFI37hW+PjiLyVmfyhNv0ihIZ7qyLgGSc
 sZzbZTqXKav5cl94uSaFVieLN2mtcTTzd1oYmbzKxsCGUq5Cy+T7nualAyai5NpW
 udKahmbiIxvihgNsvPPJtD8tewG8nqVIKan5h1nLoSq+iySnHS0b/6b1orTZ/nkg
 9xZ6YrjeVBVO6oomesiIX5MMm3BmwRioK31mCA7MsY0/RhcyP5gBlsT/cfEEiWxQ
 0dLyqPIPIi4Hw/LlbwA=
 =dQ+a
 -----END PGP SIGNATURE-----

Merge tag 'android-15.0.0_r5' into staging/lineage-22.0_merge-android-15.0.0_r5

Android 15.0.0 release 5

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZyveowAKCRDorT+BmrEO
# eEowAJ0Ut5Tkq4TVDFvrYySEynb9v8QVIQCfSPhFnaHGbSQiqBRHrEdNbZJQS3s=
# =vYsf
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Nov  6 23:24:51 2024 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2336 signatures in the past
#      3 years.  Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Akilesh Kailash
# Via Android Build Coastguard Worker
* tag 'android-15.0.0_r5':
  libsnapshot: Address GRF config when updating from Android S config
  libsnapshot: Check if the vendor is updated from Android S for GRF

Change-Id: Ib7748aa00d12b2944e84516fec058b04bc18af89
2024-11-07 14:41:19 +02:00
Android Build Coastguard Worker
da3be8887d Snap for 12406339 from fc6f0439cb to 24Q4-release
Change-Id: I6356247f31bc1b4227b2d6d3ccdc6615ecf5ab2b
2024-09-24 17:57:54 +00:00
Yumi Yukimura
79f7132bc3
fs_mgr: Add virtiofs to supported fs list
Change-Id: I8c538eff4d9f9227151d874071ce389da2e52a4d
2024-09-24 18:11:44 +03:00
Treehugger Robot
fc6f0439cb Merge "Fix the trigger name for loading bpf programs." into main am: b9e63943de am: 11afc07994
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3276895

Change-Id: Id88a9810dca6313d56e150fbded502fa843484fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-24 02:20:50 +00:00
Treehugger Robot
11afc07994 Merge "Fix the trigger name for loading bpf programs." into main am: b9e63943de
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3276895

Change-Id: I78c30b42f09705105005b08f9ea2ff0e5efbc64a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-24 02:09:50 +00:00
Treehugger Robot
b9e63943de Merge "Fix the trigger name for loading bpf programs." into main 2024-09-24 01:49:11 +00:00
Treehugger Robot
4c7732d9a7 Merge "trusty: storage: proxy: FS_READY property setting on vendor only" into main am: 02ae1e127d am: 289489a8d9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3273001

Change-Id: I928990d7ec8f949f2d670e7042afd1582646b4f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-24 01:38:42 +00:00
Treehugger Robot
289489a8d9 Merge "trusty: storage: proxy: FS_READY property setting on vendor only" into main am: 02ae1e127d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3273001

Change-Id: Id08b25eead027660914001ccaf033aecd36cdefa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-24 01:28:32 +00:00
Treehugger Robot
02ae1e127d Merge "trusty: storage: proxy: FS_READY property setting on vendor only" into main 2024-09-24 00:43:54 +00:00
Armelle Laine
d26f39ab0e trusty: storage: proxy: FS_READY property setting on vendor only
Bug: 367965796
Test: launch_cvd --noresume --console=true \
      --extra_kernel_cmdline='androidboot.selinux=permissive' \
      --secure_hals=guest_keymint_trusty_insecure
Change-Id: I4d5ea1762f7cf9edfd8cbc00e2aec13caae965f4
2024-09-23 23:38:14 +00:00
Android Build Coastguard Worker
80f82c8bee Snap for 12404440 from 9bbb654b14 to 24Q4-release
Change-Id: I04a6df70c0dbee77d83f0725bde2c09330e7243d
2024-09-23 23:25:43 +00:00
Maciej Żenczykowski
e772bd2e8c Merge "start netd earlier" into main am: 3e8f0b53e4 am: 00b74988dc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3272513

Change-Id: I00f60f89afdfe6b181a19cddb3fc72fb4a57bde8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-23 21:41:26 +00:00
Maciej Żenczykowski
b4b3950e52 Fix the trigger name for loading bpf programs.
The trigger name should be load-bpf-programs, not load_bpf_programs.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I00cff0a3dd971de39dfc3226b140be972854ea28
2024-09-23 21:34:33 +00:00
Maciej Żenczykowski
00b74988dc Merge "start netd earlier" into main am: 3e8f0b53e4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3272513

Change-Id: I27d130c076103b83ecab765264f2a3d68eeab40e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-23 21:30:52 +00:00
Treehugger Robot
1f3e1892aa Merge "Support vendor partition in non-debuggable pVMs" into main am: 23903e1655 am: d679e60b01
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3236797

Change-Id: I4e93017188a196270be64252808d35b2be5aa663
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-23 21:17:47 +00:00
Maciej Żenczykowski
3e8f0b53e4 Merge "start netd earlier" into main 2024-09-23 21:16:05 +00:00
Maciej Żenczykowski
e60b760e74 start netd earlier
In this change we're moving the asynchronous netd startup ahead of
the async statd and *synchronous* update_verifier.

This is desirable as we want a netd failure (which could
happen due to some mainline incompatibility wrt. bpf
or mainline shipped shared libs: resolver or netd updatable)
to be considered a signal for a bad boot.

It's still asynchronous though, so it's not ideal.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib3e252f085f569864feddaf20ac80858a3bb969d
2024-09-23 21:15:01 +00:00
Treehugger Robot
d679e60b01 Merge "Support vendor partition in non-debuggable pVMs" into main am: 23903e1655
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3236797

Change-Id: Ic12d27304ab3ded6f8ce00ec787461b5efcffdcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-23 20:55:27 +00:00
Treehugger Robot
23903e1655 Merge "Support vendor partition in non-debuggable pVMs" into main 2024-09-23 20:27:15 +00:00
Treehugger Robot
9bbb654b14 Merge "Move the dist target of mke2fs to build/core/tasks" into main am: 9d0b877619 am: 5db4447cb4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3271934

Change-Id: I0b635d2e8d127b8b94db62ddf432df8dbdcca72b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-23 03:10:34 +00:00
Treehugger Robot
5db4447cb4 Merge "Move the dist target of mke2fs to build/core/tasks" into main am: 9d0b877619
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3271934

Change-Id: Ie5d914df14b1e50ee09c458fa44c9ca4079393fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-23 02:55:57 +00:00
Treehugger Robot
9d0b877619 Merge "Move the dist target of mke2fs to build/core/tasks" into main 2024-09-23 02:35:53 +00:00
Android Build Coastguard Worker
a95ee3f7b6 Snap for 12397640 from 9d439d1770 to 24Q4-release
Change-Id: I8c67f3dfffbc30a290c5f124d5acd656fc0ff772
2024-09-21 01:24:14 +00:00
Inseob Kim
9d439d1770 Merge "Mount /mnt/vm earlier" into main am: 65daca3b88 am: 51d5a7f546
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3261786

Change-Id: If2cca1d108889f07b5048537395edb0b0683906b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-20 08:54:18 +00:00
Inseob Kim
51d5a7f546 Merge "Mount /mnt/vm earlier" into main am: 65daca3b88
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3261786

Change-Id: I98e3415b855b8f34e193c7f4004fdd4b208f3e79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-20 08:35:41 +00:00
Inseob Kim
65daca3b88 Merge "Mount /mnt/vm earlier" into main 2024-09-20 08:01:56 +00:00
Treehugger Robot
3420a1a4cc Merge "Replace base::RandInt with std::uniform_int_distribution" into main am: d53b098097 am: 5232f86082
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3272517

Change-Id: Ib9690fb4825c209552477a58a757d2bafb0f6c9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-20 06:14:56 +00:00
Treehugger Robot
5232f86082 Merge "Replace base::RandInt with std::uniform_int_distribution" into main am: d53b098097
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3272517

Change-Id: Ib72547353ad20d339e7315ebdb30c2e4c9777dd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-20 05:50:42 +00:00
Treehugger Robot
d53b098097 Merge "Replace base::RandInt with std::uniform_int_distribution" into main 2024-09-20 05:36:34 +00:00
Shengsong Tan
ad5948a810 Replace base::RandInt with std::uniform_int_distribution
As part of the effort to uprev libchrome in Android, we are
removing Android dependencies to libchrome utility functions
that are not strictly required.
This CL remove the usage of base::RandInt and replace by std cpp

Bug: 360917504
Change-Id: I83ea0f00ca07074f8c6c9a69db343a65cc8deb27
Test: atest libfs_avb_internal_test
2024-09-20 04:49:35 +00:00
Android Build Coastguard Worker
2a68247ae5 Snap for 12391343 from 9c963e13d6 to 24Q4-release
Change-Id: Iff82b91919595785a2cf21e372f89ed8d54b35ef
2024-09-19 23:24:22 +00:00
Treehugger Robot
9c963e13d6 Merge "trusty: keymint: rename trusty_ipc_dev property" into main am: 8da4af89fd am: afa41fedc5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3273002

Change-Id: I0d1eaf0d7fcc7e88f84c1b4f2f79324d3f0068bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-19 19:58:04 +00:00
Treehugger Robot
afa41fedc5 Merge "trusty: keymint: rename trusty_ipc_dev property" into main am: 8da4af89fd
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3273002

Change-Id: I19f2d9de9c6f7420ec2ac25f50ebb8739fa0bc6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-19 19:51:12 +00:00
Treehugger Robot
8da4af89fd Merge "trusty: keymint: rename trusty_ipc_dev property" into main 2024-09-19 19:45:51 +00:00
Android Build Coastguard Worker
32bd7a7dd5 Merge cherrypicks of ['android-review.googlesource.com/3141899', 'android-review.googlesource.com/3155338'] into 24Q3-release.
Change-Id: I12068e95fbbcca8e45c927b6ad965d46a6127c68
2024-09-19 18:41:17 +00:00
Akilesh Kailash
689516ac96 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
Signed-off-by: Akilesh Kailash <akailash@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:1b76cb48ef83bceb2a5f85ec0e18f69dde9ba0ae)
Merged-In: Ia8e6db89c3395930856ace8940424e60cae92375
Change-Id: Ia8e6db89c3395930856ace8940424e60cae92375
2024-09-19 18:41:01 +00:00
Akilesh Kailash
93096918b1 libsnapshot: Check if the vendor is updated from Android S for GRF
In a GRF config, if Vendor partition is updated from Android 12; post
OTA reboot, first stage init will communicate to daemon to check if the
daemon can support socket handoff. If that succeeds, then it is a signal
that the vendor has been updated from Android 12. Use a marker in
/metadata to signal that the vendor was updated. If the marker is present,
then post OTA reboot, userspace snapshot will be used.

Bug: 333854394
Test: OTA
Android U (system) + S (vendor) -> Android V (system) + V (Vendor)

Signed-off-by: Akilesh Kailash <akailash@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:1bbf8f042f7ffb4a38657ccf6dca0798931fecd5)
Merged-In: Ie38c4379010789a84e5b44529b407f9f82135271
Change-Id: Ie38c4379010789a84e5b44529b407f9f82135271
2024-09-19 18:40:46 +00:00
Christopher Ferris
7479cf9461 Merge "Remove define of SA_EXPOSE_TAGBITS." into main am: 57b902c32d am: 783dea9e00
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3271864

Change-Id: If6f985cd4ceff880a388a03430e125d12a683348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-19 17:56:14 +00:00
Christopher Ferris
783dea9e00 Merge "Remove define of SA_EXPOSE_TAGBITS." into main am: 57b902c32d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3271864

Change-Id: I7c2668a09ea1dacdf7220e505e136951e52deacc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-19 17:42:43 +00:00
Christopher Ferris
57b902c32d Merge "Remove define of SA_EXPOSE_TAGBITS." into main 2024-09-19 16:40:04 +00:00
Armelle Laine
2ea6ecf71d trusty: keymint: rename trusty_ipc_dev property
matching the naming convention for a system service property

Bug: 309007107
Test: launch_cvd --noresume --console=true \
      --extra_kernel_cmdline='androidboot.selinux=permissive' \
      --secure_hals=guest_keymint_trusty_insecure
Change-Id: I7c31f36dcac49d60469de44ce75c9b46a333786e
2024-09-19 14:25:45 +00:00
Nelson Li
10120f1db2 Move the dist target of mke2fs to build/core/tasks
Because `mke2fs`, `make_f2fs`, and `make_f2fs_casefold` have
`recovery_available` set to true, Soong forcibly adds a new variation
with a `_recovery` suffix to the existing variations. If this is
directly added to the `dist` of the corresponding module, it will cause
duplication of the `android_recovery_<arch>/meta_lic` and
`android_<arch>/meta_lic` files.

Therefore, it is temporarily moved to `build/core/tasks`. Once the
issues are resolved, they will be moved to the corresponding modules.

Bug: 349741178
Test: m sdk dist
Change-Id: Id003f6aed85c909aeb36606691cc4daf10c9c1d4
2024-09-19 07:19:25 +00:00
Christopher Ferris
cfdfb32d13 Remove define of SA_EXPOSE_TAGBITS.
This is in the uapi headers now.

Test: Builds and treehugger.
Change-Id: I0dcebeec722ae2835a1054ee8b39329cd06799d4
2024-09-19 02:04:16 +00:00
Android Build Coastguard Worker
167ef524b4 Snap for 12385180 from d453aa48cd to 24Q4-release
Change-Id: Ib1cee449230aa77ddb5136cb85785db9d5421b32
2024-09-18 23:24:24 +00:00