Commit graph

2066 commits

Author SHA1 Message Date
Alistair Delva
9c1a24347d Add android-6.1 for Android 14
Note: Android 6.1 dropped CONFIG_UID_SYS_STATS.

Bug: 264456132
Change-Id: I1bcb1bc09bdc273835427ed831ee997dc3122c10
2023-02-22 15:13:16 -08:00
Yifan Hong
53e85c15da Merge "Delete Android P kernel requirements." 2023-02-01 21:57:44 +00:00
Yifan Hong
455da70104 Delete Android P kernel requirements.
Devices launching with P VINTF requirements
(including HALs and kernels) will
not be able to update to Android U.

If a device wish to do so, it must update the
vendor / odm partitions to match newer VINTF
requirements.

Test: TH
Bug: 205175891
Change-Id: I0b6c0bf0955a1e9b41e84352cc706f7b73404980
2023-01-27 16:47:53 -08:00
Devin Moore
0db077b14b Update README for new compatibility_matrix naming scheme
No longer keeping a compatibility_matrix.current.xml. The matrices will
always have the level in the name.

Test: na
Bug: 266392619
Change-Id: I59f35a1d47d594644140318ff0ed1115224550f6
2023-01-25 22:13:38 +00:00
Ramji Jiyani
0654e901cd GKI: android-5.15: Update kernel config requirements am: d1f83caa93
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2311152

Change-Id: I688ce5d90280c999f3449273e7db2324c5a6feeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 17:19:40 +00:00
Ramji Jiyani
d1f83caa93 GKI: android-5.15: Update kernel config requirements
Remove L2TP, PPP and PPTP related kernel configs from
the android-base.config as these are converted to
modules.

Bug: 232431151
Test: TH
Change-Id: I4c6e6f9f14663e756a2f825469f975fe232e2559
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
2022-11-22 01:13:58 +00:00
Maciej Żenczykowski
9a0748553b p/android-4.14 - require CONFIG_NETFILTER_XT_MATCH_OWNER=y instead of QTAGUID am: 0a47f23798
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2290640

Change-Id: I3ec211d115453abe02e099c07d0049f0d3d480e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 06:08:54 +00:00
Maciej Żenczykowski
0a47f23798 p/android-4.14 - require CONFIG_NETFILTER_XT_MATCH_OWNER=y instead of QTAGUID
Technically this is not a valid change, as it restricts valid
configurations of the kernel, but... in practice... this is required
already by at least Android 11 (R) in order for traffic accounting
to work correctly.

When using xt_qtaguid Android R CTS fails:
  testTrafficStatsForLocalhost fails "java.lang.IllegalArgumentException: lower must be less than or equal to upper"
due to an extremely subtle difference in the implementation of
'-m owner --uid-owner XXX' (which xt_qtaguid breaks, by
effectively making the condition always true).

This was reported by Nvidia back in August 2021 in bug 196522401.

It takes a lot of painful debugging before we get to comment 36
which tries to make sense of things... and then comment 38 gets
to the root of the problem.

If someone does fail this (ie. VINTF) they'll need to flip:
  CONFIG_NETFILTER_XT_MATCH_QTAGUID -> n
  CONFIG_NETFILTER_XT_MATCH_OWNER -> y
  CONFIG_NET_CLS_BPF -> y

If someone actually *relies* on xt_qtaguid (and thus can't simply
flip the kernel config options) they'll need to request
a waiver for VINTF...  However, it's not at all clear how that could even happen considering the platform (userspace) side of the qtaguid implementation code was deleted in Android S (and was mainlined in T).
Additionally they'll then fail CTS, and we don't grant a waiver there.
So they simply won't be able to update to U (but I'm certain they
wouldn't have been able to run S or T either, so they'd need to be
upgrading straight from R).

Bug: 196522401
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I883e0c521e615a99f08361328dde2cd0d9a3d861
2022-11-09 01:44:55 +00:00
Maciej Żenczykowski
b3744864bc Delete {p,q}/android-4.9. am: bbde852070
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2281018

Change-Id: Ia99c38b8ba80ba4f9ddc3bee8b7c324d67e394c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 04:49:23 +00:00
Maciej Żenczykowski
bbde852070 Delete {p,q}/android-4.9.
U will not support 4.9

(not to mention that, per https://www.kernel.org/category/releases.html,
 4.9 LTS goes EOL in January 2023 [ie. in 2 months])

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Iafae8ea1e70984f84b76db9854aa074a460bce1f
2022-11-02 01:20:36 -07:00
Yifan Hong
91e74fb477 Delete p/android-4.4. am: 9f52312263
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2269308

Change-Id: I39214360d093b0272ab616127f99df07437e7962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26 18:18:27 +00:00
Yifan Hong
9f52312263 Delete p/android-4.4.
4.4 has reached EOL.
Test: TH

Change-Id: I1cfaaadd96afaeff94b651c5602fe50ea81b0e55
2022-10-25 15:26:11 -07:00
Yifan Hong
109e133a3a Update owners. am: 70cbf8a74e am: ea665b4589 am: 1dbbd86a6a am: 020901a06a
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2190191

Change-Id: I99a5c8187f640e49bf0feda620af7ee691c82cd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 13:06:22 +00:00
Yifan Hong
020901a06a Update owners. am: 70cbf8a74e am: ea665b4589 am: 1dbbd86a6a
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2190191

Change-Id: I2fcb859664a8659a2b50632e23cc226b70fbddbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 12:49:38 +00:00
Yifan Hong
1dbbd86a6a Update owners. am: 70cbf8a74e am: ea665b4589
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2190191

Change-Id: I44aa727df20aa365081178b15200720fe92fa278
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 12:31:34 +00:00
Yifan Hong
ea665b4589 Update owners. am: 70cbf8a74e
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2190191

Change-Id: Ia3d102de774129fe712be2f0250c0de4aa1dd419
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 12:13:02 +00:00
Yifan Hong
70cbf8a74e Update owners.
- gregkh

Test: none
Change-Id: Iec55bacffd002b58060fbc6e236531f740561adf
Signed-off-by: Yifan Hong <elsk@google.com>
2022-08-19 12:19:49 -07:00
Automerger Merge Worker
4b7f22521b Merge "[automerger skipped] DO NOT MERGE - Merge Android 13 am: 1b95809a64 -s ours" into stage-aosp-master am: c729510f57 -s ours am: 1f4468b345 -s ours am: 561397f71a -s ours
am skip reason: Merged-In I6c9f71288d46c310c96bbfadfcf18a35a30e8511 with SHA-1 659aee1b68 is already in history

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

Change-Id: I99c476221a177158facadfaffe0821fea70b3473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 01:10:04 +00:00
Xin Li
88e86cfa5b [automerger skipped] DO NOT MERGE - Merge Android 13 am: 1b95809a64 -s ours am: aa1c2d791a -s ours am: 1227a06260 -s ours am: 3a8dc29ddd -s ours
am skip reason: Merged-In I6c9f71288d46c310c96bbfadfcf18a35a30e8511 with SHA-1 659aee1b68 is already in history

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

Change-Id: I66d72e8bcf69ee1f3b3dfab48c6bbc61b77ff087
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 01:09:36 +00:00
Treehugger Robot
d371523d88 Merge "Update owners list." am: 5b1a43750d am: 033e2eac10 am: 434071e66f am: a01d5de034
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2186247

Change-Id: Ied3e1c0d6c7711b886977a1ab5cb044cd86a1057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 01:06:16 +00:00
Automerger Merge Worker
561397f71a Merge "[automerger skipped] DO NOT MERGE - Merge Android 13 am: 1b95809a64 -s ours" into stage-aosp-master am: c729510f57 -s ours am: 1f4468b345 -s ours
am skip reason: Merged-In I6c9f71288d46c310c96bbfadfcf18a35a30e8511 with SHA-1 659aee1b68 is already in history

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

Change-Id: I882f06e86ffcafb36a7eb80e9877375614ea64d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:55:39 +00:00
Xin Li
3a8dc29ddd [automerger skipped] DO NOT MERGE - Merge Android 13 am: 1b95809a64 -s ours am: aa1c2d791a -s ours am: 1227a06260 -s ours
am skip reason: Merged-In I6c9f71288d46c310c96bbfadfcf18a35a30e8511 with SHA-1 659aee1b68 is already in history

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

Change-Id: I931f2671f688ab9907169754d3fd10e981be4a9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:55:09 +00:00
Treehugger Robot
a01d5de034 Merge "Update owners list." am: 5b1a43750d am: 033e2eac10 am: 434071e66f
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2186247

Change-Id: I1607299c553e130e3acf3d2dca74f6a21bbab49b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:52:03 +00:00
Xin Li
5284482c7a [automerger skipped] DO NOT MERGE - Merge Android 13 am: 1b95809a64 -s ours am: b8c2bbd1fb -s ours am: 693c9325f8 -s ours am: b5e4614aee -s ours
am skip reason: Merged-In I6c9f71288d46c310c96bbfadfcf18a35a30e8511 with SHA-1 659aee1b68 is already in history

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

Change-Id: I4d1fab878de42df92900ddbc306f74f49ed5039c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:50:07 +00:00
Automerger Merge Worker
1f4468b345 Merge "[automerger skipped] DO NOT MERGE - Merge Android 13 am: 1b95809a64 -s ours" into stage-aosp-master am: c729510f57 -s ours
am skip reason: Merged-In I6c9f71288d46c310c96bbfadfcf18a35a30e8511 with SHA-1 659aee1b68 is already in history

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

Change-Id: I9993666bedc9e077a1e5a3553de0bb4e8d0b3116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:30:01 +00:00
Xin Li
1227a06260 [automerger skipped] DO NOT MERGE - Merge Android 13 am: 1b95809a64 -s ours am: aa1c2d791a -s ours
am skip reason: Merged-In I6c9f71288d46c310c96bbfadfcf18a35a30e8511 with SHA-1 659aee1b68 is already in history

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

Change-Id: Ib3a48adaa5996bea244f6fe6a736bbeef223a537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:29:32 +00:00
Xin Li
b5e4614aee [automerger skipped] DO NOT MERGE - Merge Android 13 am: 1b95809a64 -s ours am: b8c2bbd1fb -s ours am: 693c9325f8 -s ours
am skip reason: Merged-In I6c9f71288d46c310c96bbfadfcf18a35a30e8511 with SHA-1 659aee1b68 is already in history

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

Change-Id: Icf22688caa251689f552dd8cc9924076039989bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:25:53 +00:00
Treehugger Robot
434071e66f Merge "Update owners list." am: 5b1a43750d am: 033e2eac10
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2186247

Change-Id: I8adf1e82443c1070f853e56195323ed997e054b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:24:24 +00:00
Xin Li
693c9325f8 [automerger skipped] DO NOT MERGE - Merge Android 13 am: 1b95809a64 -s ours am: b8c2bbd1fb -s ours
am skip reason: Merged-In I6c9f71288d46c310c96bbfadfcf18a35a30e8511 with SHA-1 659aee1b68 is already in history

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

Change-Id: I58ede037ed7cf9a5cea169fc0513787b387a0529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:59:52 +00:00
Automerger Merge Worker
c729510f57 Merge "[automerger skipped] DO NOT MERGE - Merge Android 13 am: 1b95809a64 -s ours" into stage-aosp-master 2022-08-16 23:43:03 +00:00
Treehugger Robot
033e2eac10 Merge "Update owners list." am: 5b1a43750d
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2186247

Change-Id: I2584acf07b0ec40950087071b18b35a4fc6bfeba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:42:36 +00:00
Xin Li
aa1c2d791a [automerger skipped] DO NOT MERGE - Merge Android 13 am: 1b95809a64 -s ours
am skip reason: Merged-In I6c9f71288d46c310c96bbfadfcf18a35a30e8511 with SHA-1 659aee1b68 is already in history

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

Change-Id: Ia59182ee7308966bdad6a54aaceef86e87a7d5aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:39:48 +00:00
Xin Li
b8c2bbd1fb [automerger skipped] DO NOT MERGE - Merge Android 13 am: 1b95809a64 -s ours
am skip reason: Merged-In I6c9f71288d46c310c96bbfadfcf18a35a30e8511 with SHA-1 659aee1b68 is already in history

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

Change-Id: Ifcf7d8cb4a66f6c3b6134dd94171f9f1b0cdb9a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:37:22 +00:00
Treehugger Robot
5b1a43750d Merge "Update owners list." 2022-08-16 19:39:10 +00:00
Yifan Hong
1e332fbbf4 Update owners list.
- ghackmann (left team)
- smuckle   (left team)
+ elsk      (VINTF owner)

Test: none
Bug: none
Change-Id: Ib3294fea2c14d2ec5543ccbc47399e1b0dc2e90e
Signed-off-by: Yifan Hong <elsk@google.com>
2022-08-16 11:49:31 -07:00
Xin Li
1b95809a64 DO NOT MERGE - Merge Android 13
Bug: 242648940
Merged-In: I6c9f71288d46c310c96bbfadfcf18a35a30e8511
Change-Id: I5387679248916d79860baae224515b09773cda45
2022-08-15 22:03:56 -07:00
Xin Li
90d9d07711 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 35d1ce086c -s ours am: ae2433b9da -s ours am: a7e2326c22 -s ours
am skip reason: Merged-In I6c9f71288d46c310c96bbfadfcf18a35a30e8511 with SHA-1 659aee1b68 is already in history

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

Change-Id: Ie5cc038bc7145d2bdafd59679b56316759a29d96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 00:01:56 +00:00
Xin Li
a7e2326c22 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 35d1ce086c -s ours am: ae2433b9da -s ours
am skip reason: Merged-In I6c9f71288d46c310c96bbfadfcf18a35a30e8511 with SHA-1 659aee1b68 is already in history

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

Change-Id: I4f1b7e8e33c5fb7c2f091a5ace108160c6738784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 22:56:13 +00:00
Xin Li
ae2433b9da [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 35d1ce086c -s ours
am skip reason: Merged-In I6c9f71288d46c310c96bbfadfcf18a35a30e8511 with SHA-1 659aee1b68 is already in history

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

Change-Id: I887a5929cab9e92a3c8f51aea2d9b28a1f95b4eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 22:12:43 +00:00
Xin Li
35d1ce086c Merge tm-dev-plus-aosp-without-vendor@8763363
Bug: 236760014
Merged-In: I6c9f71288d46c310c96bbfadfcf18a35a30e8511
Change-Id: I1303ecd60ea5f7ced955206b4455bb9a10e0dde0
2022-06-27 23:38:56 +00:00
Maciej Żenczykowski
52c23cab76 Android U - require CONFIG_USB_NET_AQC111=y and CONFIG_USB_NET_CDC_NCM=y am: 659aee1b68 am: b3cc2bc03d am: d5adb3df13 am: df5a43366d
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1651969

Change-Id: I42803214acc42130c31d14a57f19d2acc8d982db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 22:31:03 +00:00
Maciej Żenczykowski
df5a43366d Android U - require CONFIG_USB_NET_AQC111=y and CONFIG_USB_NET_CDC_NCM=y am: 659aee1b68 am: b3cc2bc03d am: d5adb3df13
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1651969

Change-Id: I1fec497b65317ccfae6c2c01467206bd95cd92b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 21:00:54 +00:00
Maciej Żenczykowski
d5adb3df13 Android U - require CONFIG_USB_NET_AQC111=y and CONFIG_USB_NET_CDC_NCM=y am: 659aee1b68 am: b3cc2bc03d
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1651969

Change-Id: Idc5fa922009c049032d333c65458b9a29837ecec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 20:27:41 +00:00
Maciej Żenczykowski
b3cc2bc03d Android U - require CONFIG_USB_NET_AQC111=y and CONFIG_USB_NET_CDC_NCM=y am: 659aee1b68
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1651969

Change-Id: I492596135fc2177d48f4eda634edc209751c6362
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 19:58:28 +00:00
Maciej Żenczykowski
55ba1a5bf5 Android U - require CONFIG_IFB=y am: 1972a9b6c4 am: 363058c051 am: 3d91ce3e8d am: 3fa82836ff
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1651970

Change-Id: I16563bc41ef1b7ae19310408e537b3d187c5ed19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 00:37:09 +00:00
Maciej Żenczykowski
3fa82836ff Android U - require CONFIG_IFB=y am: 1972a9b6c4 am: 363058c051 am: 3d91ce3e8d
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1651970

Change-Id: I2c5d82561508f246dadac52ab4cb0b47041a1ef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 23:55:46 +00:00
Maciej Żenczykowski
3d91ce3e8d Android U - require CONFIG_IFB=y am: 1972a9b6c4 am: 363058c051
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1651970

Change-Id: I4cf94331d1ba9ce9e6195fd7103e0967b68ab67f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 23:29:51 +00:00
Maciej Żenczykowski
363058c051 Android U - require CONFIG_IFB=y am: 1972a9b6c4
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1651970

Change-Id: I6ad6f844251135d9fd98dc61bc6874fba0a0ab4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 23:02:42 +00:00
Maciej Żenczykowski
659aee1b68 Android U - require CONFIG_USB_NET_AQC111=y and CONFIG_USB_NET_CDC_NCM=y
These two drivers support every >1 gigabit usb ethernet dongle
I've managed to get my hands on.

In practice already enabled on GKI 5.10+ since S.
  $ for i in AND510{S,T} AND515T ANDM; do cd /git/$i; echo; echo $i; git grep '^CONFIG_USB_NET_AQC111=y$' | egrep gki_defconfig; done

  AND510S
  arch/arm64/configs/gki_defconfig:342:CONFIG_USB_NET_AQC111=y
  arch/x86/configs/gki_defconfig:314:CONFIG_USB_NET_AQC111=y

  AND510T
  arch/arm64/configs/gki_defconfig:354:CONFIG_USB_NET_AQC111=y
  arch/x86/configs/gki_defconfig:325:CONFIG_USB_NET_AQC111=y

  AND515T
  arch/arm64/configs/gki_defconfig:350:CONFIG_USB_NET_AQC111=y
  arch/x86/configs/gki_defconfig:320:CONFIG_USB_NET_AQC111=y

  ANDM
  arch/arm64/configs/gki_defconfig:342:CONFIG_USB_NET_AQC111=y
  arch/x86/configs/gki_defconfig:315:CONFIG_USB_NET_AQC111=y

(while CONFIG_USB_NET_CDC_NCM defaults to 'y')

Test: TreeHugger
Bug: 183564444
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I6c9f71288d46c310c96bbfadfcf18a35a30e8511
2022-06-11 12:24:51 -07:00
Maciej Żenczykowski
1972a9b6c4 Android U - require CONFIG_IFB=y
Can be used for implementing better ingress rate limiting.

In practice already enabled on GKI 5.10+ since S.
  $ for i in AND510{S,T} AND515T ANDM; do cd /git/$i; echo; echo $i; git grep '^CONFIG_IFB=y$' | egrep gki_defconfig; done
  AND510S
  arch/arm64/configs/gki_defconfig:324:CONFIG_IFB=y
  arch/x86/configs/gki_defconfig:296:CONFIG_IFB=y

  AND510T
  arch/arm64/configs/gki_defconfig:337:CONFIG_IFB=y
  arch/x86/configs/gki_defconfig:308:CONFIG_IFB=y

  AND515T
  arch/arm64/configs/gki_defconfig:333:CONFIG_IFB=y
  arch/x86/configs/gki_defconfig:303:CONFIG_IFB=y

  ANDM
  arch/arm64/configs/gki_defconfig:325:CONFIG_IFB=y
  arch/x86/configs/gki_defconfig:298:CONFIG_IFB=y

Test: TreeHugger
Bug: 179454839
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I04cf0ca5dae83d73f91b75b99fd6263c7e686aef
2022-06-11 12:23:43 -07:00