This reverts commit 71c8608ebd.
Reason for revert: Prebuilt kernel binaries have been updated in AOSP, so should no longer cause issues.
Change-Id: I44ac79f04ef1389becf7e31e1a0d197c62bfb005
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
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
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
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>
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
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
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>
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
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
