Commit graph

2212 commits

Author SHA1 Message Date
Todd Kjos
786dab5f2f Merge "Update v/android-6.6 based on changes since 6.1" into main am: a5e41d29a0
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2861073

Change-Id: I021223ea499333852b94c1566970502f8d62af26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 20:58:33 +00:00
Todd Kjos
a5e41d29a0 Merge "Update v/android-6.6 based on changes since 6.1" into main 2023-12-06 20:15:01 +00:00
Devin Moore
4265e24467 Remove binder device config requirement am: 8c70330d6d
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2861066

Change-Id: Ie5896c900bc2cd3aae63c913ee04ad6d6e281da2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 17:28:49 +00:00
Will McVicker
2cc1e530a2 Update v/android-6.6 based on changes since 6.1
* Drop CONFIG_USB_NET_AQ111 and CONFIG_USB_NET_CDC_NCM since these are
  GKI modules now
* Replace CONFIG_EMBEDDED with CONFIG_EXPERT due to commit ef815d2cba78
  ("treewide: drop CONFIG_EMBEDDED")

Bug: 311450232
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: Ia33e9f64d7cdaa1677ee7d7fa0dd6659c9ff5b09
2023-12-06 01:03:16 +00:00
Devin Moore
8c70330d6d Remove binder device config requirement
/dev/vndbinder shouldn't be required because vndbinder/vndservicemanager
has been deprecated (optional).
https://source.android.com/docs/core/architecture/hidl/binder-ipc#vndbinder

/dev/hwbinder is no longer required because HIDL is being deprecated and
devices can soon be released without hwservicemanager.

Test: atest vts_treble_vintf_framework_test
Bug: 296459107
Change-Id: I67f3b76c8213877ee1d57ab5623a018cda3726a2
2023-12-06 00:04:27 +00:00
William McVicker
a58b23d148 Create v/android-6.6 based off of v/6.1 am: ec7e744031
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2855350

Change-Id: I2c41256a442c85339e7a5ddc96155eb65405a5ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04 18:56:23 +00:00
William McVicker
ec7e744031 Create v/android-6.6 based off of v/6.1
Bug: 311450232
Signed-off-by: William McVicker <willmcvicker@google.com>
Change-Id: I17507419b8136f1cbbba4cf2bd3462db9ceed3bb
2023-11-30 16:41:53 -08:00
Devin Moore
9c4fa23330 Revert "Remove Android Q kernel configs" am: 0606f4897c
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2810370

Change-Id: I775d4bd6cad5def914bca35d576a414e80950010
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 00:11:08 +00:00
Devin Moore
0606f4897c Revert "Remove Android Q kernel configs"
Revert submission 2808255-deprecate_android_q

Reason for revert: Broke a device build that is targeting Q b/308482858

Reverted changes: /q/submissionid:2808255-deprecate_android_q

Change-Id: If152748d2b8420fd0b48e1ebfd49f11ff5b470b8
2023-10-30 22:38:31 +00:00
Devin Moore
2fe3e94ce7 Remove Android Q kernel configs am: d52237ed0e
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2808255

Change-Id: I1b26e13e12bbe040023a11b3b843a610a42f85f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 19:45:31 +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
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
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
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
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
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
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
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
ba21d11205 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
Test: TH
Change-Id: I99f793358bcc99726305ef88ca335fe023233f30
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
2023-05-05 14:29:41 -07:00
Ramji Jiyani
d5add68cea GKI: U: Remove USB NET kernel config requirements am: 79ecc82dcc am: ecb2b3a568 am: adc818b2d3 am: 6b4ebf90f6 am: 686eeb1d63
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2580393

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

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

Change-Id: Ie861b62b8db84828568234e17c56c7d97372c718
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 19:33:42 +00:00
Ramji Jiyani
adc818b2d3 GKI: U: Remove USB NET kernel config requirements am: 79ecc82dcc am: ecb2b3a568
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2580393

Change-Id: Iba4bb72497f04e93dfbf79292db4d378d0d9610b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 18:50:42 +00:00