Commit graph

2148 commits

Author SHA1 Message Date
Yifan Hong
4c83bb13ad Move current requirements to v/ folder. am: 52a7267d6a am: 4626c81c08 am: 5c807eee98
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2532039

Change-Id: I782effae7d447413ec0bd52548650cc2228e7851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 08:05:55 +00:00
Yifan Hong
93a11a8250 Copy U requirements to u/ folder. am: c15e973a45 am: 0c15e1ca86 am: 737d9fa161
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2531980

Change-Id: I594d197d5ced06fa5249581b18979bcc0a3bdac5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 08:05:51 +00:00
Yifan Hong
5c807eee98 Move current requirements to v/ folder. am: 52a7267d6a am: 4626c81c08
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2532039

Change-Id: I5589413d82435b5b9e2758e04a1a4c652c31e9f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 07:33:08 +00:00
Yifan Hong
737d9fa161 Copy U requirements to u/ folder. am: c15e973a45 am: 0c15e1ca86
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2531980

Change-Id: I7de7855d46e4ced0ff3dee79bd1924875e597e16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 07:33:06 +00:00
Yifan Hong
4626c81c08 Move current requirements to v/ folder. am: 52a7267d6a
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2532039

Change-Id: I8b54f6b473f8f083fbc539553402cc07a31db360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 07:00:21 +00:00
Yifan Hong
0c15e1ca86 Copy U requirements to u/ folder. am: c15e973a45
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2531980

Change-Id: Iad212275e549ffc357e43dd4daa2b7dd618d6d9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 07:00:17 +00:00
Yifan Hong
52a7267d6a Move current requirements to v/ folder.
Like compatibility matrices, we no longer maintains
a current version of the kernel requirements. All
kernel requirements are denoted with the dessert
release.

Test: TH
Change-Id: Ic0bc57c4e78d2f038d70bf0286a89625687947ef
2023-04-11 14:16:31 -07:00
Yifan Hong
c15e973a45 Copy U requirements to u/ folder.
This is the first step of finalizing the U requirements.

This change copies android-5.15/ and android-6.1/
into u/ without any changes.

minlts is not finalized in this change.

Test: TH
Change-Id: I14dd5f42c8796fb94cdfab04ef2e48fb10a2c743
2023-04-11 14:16:22 -07:00
Lakshman Annadorai
57fa01f0d2 Add CONFIG_CPU_FREQ(_STAT|_TIMES)?=y to android base configs. am: 807828eea7 am: 020f96df9e am: 43a5566d43
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2510135

Change-Id: I0d5f823272980dc42eaa3033780556df32265bfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 23:58:10 +00:00
Lakshman Annadorai
43a5566d43 Add CONFIG_CPU_FREQ(_STAT|_TIMES)?=y to android base configs. am: 807828eea7 am: 020f96df9e
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2510135

Change-Id: I27c185096e0b90e150ddbe5389dfe9309c741803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 23:11:44 +00:00
Lakshman Annadorai
020f96df9e Add CONFIG_CPU_FREQ(_STAT|_TIMES)?=y to android base configs. am: 807828eea7
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2510135

Change-Id: I9d4f06c2f7bd32438813381dd08e2346b3f17023
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 22:45:33 +00:00
Lakshman Annadorai
807828eea7 Add CONFIG_CPU_FREQ(_STAT|_TIMES)?=y to android base configs.
Change-Id: Ibf5e32441b7bc47bc9ae4634de0f5657a853e960
Test: TreeHugger
Bug: 274176457
2023-03-27 20:54:21 +00:00
Neill Kapron
acf2ea16bf Revert "GKI: android-6.1: Require uid_sys_stats" am: 71c8608ebd am: 15f605bb54 am: 0b9ce93cf6
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2480481

Change-Id: Ie3aa87be8075dc0a502006fd6ab3ca6662ae7646
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 06:10:26 +00:00
Neill Kapron
0b9ce93cf6 Revert "GKI: android-6.1: Require uid_sys_stats" am: 71c8608ebd am: 15f605bb54
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2480481

Change-Id: I95bcc5be3109f835f730923a376abf3e6224ab56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 05:49:27 +00:00
Neill Kapron
15f605bb54 Revert "GKI: android-6.1: Require uid_sys_stats" am: 71c8608ebd
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2480481

Change-Id: Iac9930c462b099ba09d3fa712167e6f5cb9afa76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 05:23:26 +00:00
Neill Kapron
8e20832e4b GKI: android-6.1: Require uid_sys_stats am: 51b9c22479 am: a5169282c4 am: df8458fdf6
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2480476

Change-Id: I74825cf3b4d7324b6f150d083db7adf1af99523b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 01:34:23 +00:00
Neill Kapron
71c8608ebd Revert "GKI: android-6.1: Require uid_sys_stats"
Revert submission 2480476-uid_sys_stats-b219790626

Reason for revert: Causes the following build failure on aosp-master-with-phones with aosp_cf_x86_64_phone-userdebug:

ERROR: files are incompatible: Runtime info and framework compatibility matrix are incompatible: No compatible kernel requirement found (kernel FCM version = 8).
For kernel requirements at matrix level 8, Missing config CONFIG_UID_SYS_STATS
: Success
INCOMPATIBLE

Reverted changes: /q/submissionid:2480476-uid_sys_stats-b219790626

Change-Id: Ib593f1e1d4702eec299108dd5df1f34b8c9e69b3
2023-03-10 01:18:50 +00:00
Neill Kapron
df8458fdf6 GKI: android-6.1: Require uid_sys_stats am: 51b9c22479 am: a5169282c4
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2480476

Change-Id: I0f7bbc3bd5bafd3a2ac2dda51c256edcd6c2ccee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 00:55:19 +00:00
Neill Kapron
a5169282c4 GKI: android-6.1: Require uid_sys_stats am: 51b9c22479
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2480476

Change-Id: I6161c4277a45b24530b2f3932f4381007ab11d07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 00:11:59 +00:00
Neill Kapron
51b9c22479 GKI: android-6.1: Require uid_sys_stats
CONFIG_UID_SYS_STATS was left out of 6.1 due to upstream changes
breaking support. With the associated changes being reverted in
android14-6.1 kernel, require for 6.1 base config.

Bug: 219790626
Change-Id: I903ecaa2ede25734dff1d9e7d61a30ecec7dfb7c
Signed-off-by: Neill Kapron <nkapron@google.com>
2023-03-09 21:08:12 +00:00
Alistair Delva
9c1d7ed6e2 Drop android-5.10 for Android 14 am: c78288e0f1 am: c67994de3d am: ca3674eede
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2451885

Change-Id: I919736f6780f44bc6668ab083892157a4282c454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 22:54:51 +00:00
Alistair Delva
ca3674eede Drop android-5.10 for Android 14 am: c78288e0f1 am: c67994de3d
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2451885

Change-Id: Ic3070ad8d27b49f275b8a4adca81b44155b9336c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 22:19:06 +00:00
Alistair Delva
c67994de3d Drop android-5.10 for Android 14 am: c78288e0f1
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2451885

Change-Id: I330401b42a1dba016e26cac23b021e99cec91481
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 21:44:15 +00:00
Alistair Delva
c78288e0f1 Drop android-5.10 for Android 14
Using the "T" / Android 13 kernel with Android 14 is still allowed.

Bug: 264456132
Change-Id: I7fa0f9b0d0bbac96b2dce55338c95dc6f4719b1e
2023-02-23 23:09:00 +00:00
Alistair Delva
666225fceb Add android-6.1 for Android 14 am: 9c1a24347d am: f747a8f9fc am: 6797053263
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2450908

Change-Id: I787dce7747f1b4b788c57226e08e53a54ef72613
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 20:49:16 +00:00
Alistair Delva
6797053263 Add android-6.1 for Android 14 am: 9c1a24347d am: f747a8f9fc
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2450908

Change-Id: I00b496440c422bf3887170a7932222e698964c0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 19:48:39 +00:00
Alistair Delva
f747a8f9fc Add android-6.1 for Android 14 am: 9c1a24347d
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2450908

Change-Id: Ib5466fe44e3b3be06c8c638fa9152f8ba0f13b89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 19:12:13 +00:00
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
855f93ba6a Merge "Delete Android P kernel requirements." am: 53e85c15da am: cc3c9e7cef am: 0426035747
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2404737

Change-Id: I15daa673fee139f635233c7fcfd18cccd9ffcff3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 00:50:02 +00:00
Yifan Hong
0426035747 Merge "Delete Android P kernel requirements." am: 53e85c15da am: cc3c9e7cef
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2404737

Change-Id: I754ef926ce26c063fea92b93f5f0c02ff254dd90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 23:59:55 +00:00
Yifan Hong
cc3c9e7cef Merge "Delete Android P kernel requirements." am: 53e85c15da
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2404737

Change-Id: I6fc3e8d0ec353d670d3cae47e9b7179fedfbd063
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 22:41:54 +00: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
3f5627058d Update README for new compatibility_matrix naming scheme am: 0db077b14b am: cafe160f6b am: 6f55ff7656
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2403272

Change-Id: I86ce5f9800bcf7a2eb53aab13ec52ecb4c860647
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-26 22:45:46 +00:00
Devin Moore
6f55ff7656 Update README for new compatibility_matrix naming scheme am: 0db077b14b am: cafe160f6b
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2403272

Change-Id: I6592df2b6961b591ff65fbd4f1fdf1e61ae91bb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-26 22:00:38 +00:00
Devin Moore
cafe160f6b Update README for new compatibility_matrix naming scheme am: 0db077b14b
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2403272

Change-Id: I60748306513e5507b5c15d738eef5cda6ebb7a3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-26 21:22:52 +00: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
a92e9fc088 GKI: android-5.15: Update kernel config requirements am: d1f83caa93 am: 0654e901cd am: f3b5a441eb
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2311152

Change-Id: Iaa6a97669fff29690dffdae1829ee662c8f20dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 20:14:48 +00:00
Ramji Jiyani
f3b5a441eb GKI: android-5.15: Update kernel config requirements am: d1f83caa93 am: 0654e901cd
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2311152

Change-Id: Ib538e784e8d59d85db08d98f06627c8fa7dc04f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 19:11:51 +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
9c4ff6b18f p/android-4.14 - require CONFIG_NETFILTER_XT_MATCH_OWNER=y instead of QTAGUID am: 0a47f23798 am: 9a0748553b am: b77da469bc
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2290640

Change-Id: Ie71cd9f838db7ce01fe9a4636d76ba6f0e51fd2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 07:10:55 +00:00
Maciej Żenczykowski
b77da469bc p/android-4.14 - require CONFIG_NETFILTER_XT_MATCH_OWNER=y instead of QTAGUID am: 0a47f23798 am: 9a0748553b
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2290640

Change-Id: I94f79baea476b5a41636af1bfa72efe2595e570f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 06:37:33 +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
8ab226b281 Delete {p,q}/android-4.9. am: bbde852070 am: b3744864bc am: ad197b0215
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2281018

Change-Id: I3688c9041c062e0a3b45343108cbffc3619c758e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 05:52:59 +00:00
Maciej Żenczykowski
ad197b0215 Delete {p,q}/android-4.9. am: bbde852070 am: b3744864bc
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2281018

Change-Id: Ic58ff2a67f148b210e777ca505fec0b352ba9b9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 05:16: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
8452b2053b Delete p/android-4.4. am: 9f52312263 am: 91e74fb477 am: d4d77424f6
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2269308

Change-Id: Ic7c78ada9cf3397a926a9da5285dad8c8be307e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26 19:53:31 +00:00