Commit graph

2289 commits

Author SHA1 Message Date
Devin Moore
10c67dcf84 Remove Android Q kernel configs am: d52237ed0e
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2808255

Change-Id: I08ab3509ee818f4579dd6ddf7fab8f8ac6a85a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 17:24:05 +00:00
Devin Moore
d52237ed0e Remove Android Q kernel configs
Devices with Q VINTF won't be able to upgrade to Android V. Devices
launching with Q or earlier need to update their VINTF to at least R to
work with Android V.

Test: m check-vintf-all
Bug: 279809679
Change-Id: I662d75ebbfcad2446ecccbe986cad44a3f7370b9
2023-10-27 18:28:30 +00:00
Eric Biggers
8e69d50ac7 Stop requiring CONFIG_FS_VERITY_BUILTIN_SIGNATURES am: 07e726fb7d am: 39d84faf16 am: 2faf0518c9 am: 7e2a394022 am: fbbb801e83
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2650402

Change-Id: I7d1de392691eba15ff29289f4692d29b0b4e1027
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 21:26:02 +00:00
Eric Biggers
fbbb801e83 Stop requiring CONFIG_FS_VERITY_BUILTIN_SIGNATURES am: 07e726fb7d am: 39d84faf16 am: 2faf0518c9 am: 7e2a394022
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2650402

Change-Id: Ia1104bd193e8daec2f97ba5d5ae195cd0a7769bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 20:39:29 +00:00
Eric Biggers
7e2a394022 Stop requiring CONFIG_FS_VERITY_BUILTIN_SIGNATURES am: 07e726fb7d am: 39d84faf16 am: 2faf0518c9
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2650402

Change-Id: Ia0ada53025731faa6f009037b84c4f9ead7ec4f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 19:51:09 +00:00
Eric Biggers
2faf0518c9 Stop requiring CONFIG_FS_VERITY_BUILTIN_SIGNATURES am: 07e726fb7d am: 39d84faf16
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2650402

Change-Id: Ida2b947b9352efe3e5ac4d64aa99fb04b560c4c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 19:03:36 +00:00
Eric Biggers
39d84faf16 Stop requiring CONFIG_FS_VERITY_BUILTIN_SIGNATURES am: 07e726fb7d
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2650402

Change-Id: I8d844b1ccd948304bbc79628b1e4027a488e64d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 18:16:47 +00:00
Eric Biggers
07e726fb7d Stop requiring CONFIG_FS_VERITY_BUILTIN_SIGNATURES
Android no longer uses fsverity builtin signatures, so stop requiring
CONFIG_FS_VERITY_BUILTIN_SIGNATURES.

Bug: 290060816
Test: presubmit
Change-Id: Icd324d1dcc536d3428b0013e5e40ceb910894684
2023-07-17 20:14:27 +00:00
Xin Li
753a88ad3f [automerger skipped] Empty Merge Android U (ab/10368041) am: d81e37fb77 -s ours am: d5623f5fc8 -s ours am: 4bc0296ec2 -s ours am: 026aab4aec -s ours
am skip reason: Merged-In Id8f4f33b7e9bb23d9853f41720d6daf484ae4b5e with SHA-1 eb41d9f07d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/24087789

Change-Id: Ibd06fa337dc535f376ac51fe9cccd2c1e9e8b3b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15 06:21:56 +00:00
Xin Li
026aab4aec [automerger skipped] Empty Merge Android U (ab/10368041) am: d81e37fb77 -s ours am: d5623f5fc8 -s ours am: 4bc0296ec2 -s ours
am skip reason: Merged-In Id8f4f33b7e9bb23d9853f41720d6daf484ae4b5e with SHA-1 eb41d9f07d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/24087789

Change-Id: I6d3a008c60899a274500e7374295bb3ece37d904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15 05:13:24 +00:00
Xin Li
4bc0296ec2 [automerger skipped] Empty Merge Android U (ab/10368041) am: d81e37fb77 -s ours am: d5623f5fc8 -s ours
am skip reason: Merged-In Id8f4f33b7e9bb23d9853f41720d6daf484ae4b5e with SHA-1 eb41d9f07d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/24087789

Change-Id: I39e16fd55cc964b3e5deafd79a9770ac36dc0b9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15 04:29:56 +00:00
Xin Li
d5623f5fc8 [automerger skipped] Empty Merge Android U (ab/10368041) am: d81e37fb77 -s ours
am skip reason: Merged-In Id8f4f33b7e9bb23d9853f41720d6daf484ae4b5e with SHA-1 eb41d9f07d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/24087789

Change-Id: Ie670bcdcfcea7f9bbf968c3b632c011c093abe4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15 03:22:14 +00:00
Xin Li
d81e37fb77 Empty Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: Id8f4f33b7e9bb23d9853f41720d6daf484ae4b5e
Change-Id: I002e9a5cada09f0972d4a19272ac0e2991da22a8
2023-07-14 16:53:34 -07:00
Yifan Hong
a2f9afa0b4 freeze.py -> bump.py. am: fdfede030e am: 651ee56820 am: c682be40e3 am: 6fc7ec8c37 am: f66f96cfef am: c4211e9393
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2573074

Change-Id: I89a357e84954d704d0bcbee52c231b0758a04a35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 01:10:55 +00:00
Yifan Hong
c6b623fcd6 Update freeze.py for new scheme. am: 5a600e744e am: 344cd7b0db am: 17bfef6467 am: 79aaa1f1ba am: 07271b6538 am: 5ae0fecb9d
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2572972

Change-Id: Id140ea3be71f09ac7a057bd802b8bd39183bf1e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 01:09:52 +00:00
Yifan Hong
c4211e9393 freeze.py -> bump.py. am: fdfede030e am: 651ee56820 am: c682be40e3 am: 6fc7ec8c37 am: f66f96cfef
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2573074

Change-Id: If07434cb7883af73c6e3b0e73ebde90e0b81a30b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 00:30:34 +00:00
Yifan Hong
5ae0fecb9d Update freeze.py for new scheme. am: 5a600e744e am: 344cd7b0db am: 17bfef6467 am: 79aaa1f1ba am: 07271b6538
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2572972

Change-Id: I63c6221f987861c662287a3e5470151a88c65373
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 00:29:49 +00:00
Yifan Hong
f66f96cfef freeze.py -> bump.py. am: fdfede030e am: 651ee56820 am: c682be40e3 am: 6fc7ec8c37
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2573074

Change-Id: Ic6301ef977181c72f3ed18548459e9d46f2174c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 23:48:43 +00:00
Yifan Hong
07271b6538 Update freeze.py for new scheme. am: 5a600e744e am: 344cd7b0db am: 17bfef6467 am: 79aaa1f1ba
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2572972

Change-Id: I06b2e9e39543217395302ff24c0d2e5e8f895234
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 23:47:35 +00:00
Yifan Hong
6fc7ec8c37 freeze.py -> bump.py. am: fdfede030e am: 651ee56820 am: c682be40e3
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2573074

Change-Id: I36172aac14db5018d0c9a35864681b0c38f2353f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 23:07:16 +00:00
Yifan Hong
79aaa1f1ba Update freeze.py for new scheme. am: 5a600e744e am: 344cd7b0db am: 17bfef6467
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2572972

Change-Id: I422d3b9da55fda58aebac2509f52468453317efa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 23:06:46 +00:00
Yifan Hong
c682be40e3 freeze.py -> bump.py. am: fdfede030e am: 651ee56820
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2573074

Change-Id: I56ec4f9106a218482fc4e7306e62c9c5a161b833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 22:26:51 +00:00
Yifan Hong
17bfef6467 Update freeze.py for new scheme. am: 5a600e744e am: 344cd7b0db
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2572972

Change-Id: Iff96fbe991c821695a282fc6dbefde3f78a1db94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 22:26:41 +00:00
Yifan Hong
651ee56820 freeze.py -> bump.py. am: fdfede030e
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2573074

Change-Id: Ica3e1914af165549395bb928d44604990d23c33a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 21:45:07 +00:00
Yifan Hong
344cd7b0db Update freeze.py for new scheme. am: 5a600e744e
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2572972

Change-Id: I1ef9bb03acbc09c8df564e5f642fa18f287e28ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 21:44:22 +00:00
Yifan Hong
fdfede030e freeze.py -> bump.py.
... since we no longer freeze the ToT current version,
only create the next version.

Test: manual
Bug: 279809082
Change-Id: I54324795b6e73f1f55e9c32e9e6eedb7c346835b
2023-07-10 12:36:43 -07:00
Yifan Hong
5a600e744e Update freeze.py for new scheme.
We no longer keep a current version of the configs. We only
have the dessert letter for the next release.

Update the script to reflect this change.

In addition, the script no longer updates hardware/interfaces;
it is up to that repository to update necessary definitions.

In addition, per guideline for scripts for advancing to
the next release, delete all git commands in the script.

Test: manual (freeze.py v w)
Bug: 279809082

Change-Id: Ib6f6fa087e4830abdfe97f2f8c395a887a418021
2023-07-10 12:36:43 -07:00
Ramji Jiyani
cb745e102b GKI: U: Remove USB NET kernel config requirements am: f759824788 am: 316b0af279
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/23333702

Change-Id: I2785c859410e81ec5deb815580cbef369f255d34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 17:44:33 +00:00
Ramji Jiyani
ced55a766c GKI: U: Remove USB NET kernel config requirements am: f759824788 am: 2ba4cbf42c am: 4095915492 am: 16bebabbb9
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/23333702

Change-Id: I9a1df1896e935cc0f7b6b1c80ee5b47b7e3a5d8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 02:27:12 +00:00
Ramji Jiyani
4e569350a2 GKI: U: Remove USB NET kernel config requirements am: f759824788 am: eb41d9f07d am: 0ea2d1b62e am: 6f25e862e8
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/23333702

Change-Id: Ia861c6941c22b5d0f436a7e300d5cf7f56eb5073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 02:26:12 +00:00
Ramji Jiyani
6e87b00672 GKI: U: Remove USB NET kernel config requirements am: f759824788 am: 2ba4cbf42c am: 48e5697d07 am: bc7515f5aa
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/23333702

Change-Id: I0c3c9fca1d72a6ab85269bc330aeec4eb5446bbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 02:07:58 +00:00
Ramji Jiyani
16bebabbb9 GKI: U: Remove USB NET kernel config requirements am: f759824788 am: 2ba4cbf42c am: 4095915492
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/23333702

Change-Id: I75f6f9d0ee576e6c94c7eb8e8e0437e0c16b4f44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 01:26:09 +00:00
Ramji Jiyani
6f25e862e8 GKI: U: Remove USB NET kernel config requirements am: f759824788 am: eb41d9f07d am: 0ea2d1b62e
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/23333702

Change-Id: I150f99824900c6fc13ca9eb4c4169618bf2767d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 01:23:52 +00:00
Ramji Jiyani
bc7515f5aa GKI: U: Remove USB NET kernel config requirements am: f759824788 am: 2ba4cbf42c am: 48e5697d07
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/23333702

Change-Id: I5fae5ef82a0fb14b35c2fe1b28bf848b4e3aec94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 01:23:32 +00:00
Ramji Jiyani
4095915492 GKI: U: Remove USB NET kernel config requirements am: f759824788 am: 2ba4cbf42c
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/23333702

Change-Id: I35f421c91e1f5fc5ae8f0cc7a429c4273d4d3c72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 00:40:51 +00:00
Ramji Jiyani
0ea2d1b62e GKI: U: Remove USB NET kernel config requirements am: f759824788 am: eb41d9f07d
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/23333702

Change-Id: Ib6180b2a1dcfbcf6d7baaf9647bef118c469d622
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 00:40:49 +00:00
Ramji Jiyani
7078c81cf7 GKI: U: Remove USB NET kernel config requirements am: f759824788 am: 35e24c998c
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/23333702

Change-Id: Ie4baed2c39fa8516d5a736cb46f0d25be6375643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 00:39:33 +00:00
Ramji Jiyani
48e5697d07 GKI: U: Remove USB NET kernel config requirements am: f759824788 am: 2ba4cbf42c
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/23333702

Change-Id: I3dd7bb906c95e36cfa4d9bde7f2fe31adaa0f71f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 00:38:46 +00:00
Ramji Jiyani
eb41d9f07d GKI: U: Remove USB NET kernel config requirements am: f759824788
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/23333702

Change-Id: Id8f4f33b7e9bb23d9853f41720d6daf484ae4b5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:59:09 +00:00
Ramji Jiyani
2ba4cbf42c GKI: U: Remove USB NET kernel config requirements am: f759824788
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/23333702

Change-Id: I2eac95944fb149547a6b0de961f7a84b61be3b94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:58:46 +00:00
Ramji Jiyani
35e24c998c GKI: U: Remove USB NET kernel config requirements am: f759824788
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/23333702

Change-Id: If15b330d7ad007c6702e7503b74cfa06e604decb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:58:06 +00:00
Ramji Jiyani
316b0af279 GKI: U: Remove USB NET kernel config requirements am: f759824788
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/23333702

Change-Id: Ia995829dea834c2ae13d692ffb414b26c6dce83a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:58:00 +00:00
Ramji Jiyani
f759824788 GKI: U: Remove USB NET kernel config requirements
Remove these kernel configs from the android-base.config
as these are converted to GKI modules for android14-* and
later kernels.

CONFIG_USB_NET_AQC111
CONFIG_USB_NET_CDC_NCM

Bug: 279972445
Bug: 280896629
Bug: 283116250
Test: TH
Change-Id: I99f793358bcc99726305ef88ca335fe023233f30
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
(cherry picked from commit ba21d11205)
2023-05-18 22:31:38 +00:00
Ramji Jiyani
f02eae2033 GKI: U: Remove USB NET kernel config requirements am: ba21d11205 am: 4c82e26984 am: 580aa8f34f
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/23062266

Change-Id: Ic3039e19497ceb1033db0d1938ccae156d6dc864
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 05:31:11 +00:00
Ramji Jiyani
fe30ba2ebf GKI: U: Remove USB NET kernel config requirements am: ba21d11205 am: 582d86e199 am: 3cae129d59
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/23062266

Change-Id: I5c05f71764ffda3e6bd9348a39ffd5b301f79d4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 05:30:16 +00:00
Ramji Jiyani
580aa8f34f GKI: U: Remove USB NET kernel config requirements am: ba21d11205 am: 4c82e26984
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/23062266

Change-Id: I6b9e6620a02b686737366f4c429f141cfd458e58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 04:48:24 +00:00
Ramji Jiyani
3cae129d59 GKI: U: Remove USB NET kernel config requirements am: ba21d11205 am: 582d86e199
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/23062266

Change-Id: I02ec02b769d653d849005bdc206cd7d1ec1d9f53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 04:42:49 +00:00
Ramji Jiyani
4c82e26984 GKI: U: Remove USB NET kernel config requirements am: ba21d11205
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/23062266

Change-Id: I116f6ad1a67ddacf1a199defa34224422367b852
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 04:05:30 +00:00
Ramji Jiyani
582d86e199 GKI: U: Remove USB NET kernel config requirements am: ba21d11205
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/23062266

Change-Id: I54984b287330c0fbf41659ad7ade24f86c8a671f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 04:01:18 +00:00
Ramji Jiyani
4867802445 GKI: U: Remove USB NET kernel config requirements am: 79ecc82dcc am: ecb2b3a568 am: adc818b2d3 am: 6b4ebf90f6 am: 686eeb1d63 am: d5add68cea
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2580393

Change-Id: Id08a2240f61273a5e8a2eecb651033af2ee1afeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 21:44:07 +00:00