From 959f84d169a13c44f6738e371814debcfa81356f Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Tue, 26 Apr 2022 15:07:36 -0700 Subject: Delete recommended kernel configs. Now with GKI, we no longer recommend configs. Test: TH Bug: 230144764 Change-Id: I3f3f9401482603eb41d03870b1a233d31b54a367 --- android-5.10/android-recommended-arm.config | 6 -- android-5.10/android-recommended-arm64.config | 7 -- android-5.10/android-recommended-x86.config | 5 - android-5.10/android-recommended.config | 131 -------------------------- android-5.15/android-recommended-arm.config | 6 -- android-5.15/android-recommended-arm64.config | 6 -- android-5.15/android-recommended-x86.config | 4 - android-5.15/android-recommended.config | 131 -------------------------- 8 files changed, 296 deletions(-) delete mode 100644 android-5.10/android-recommended-arm.config delete mode 100644 android-5.10/android-recommended-arm64.config delete mode 100644 android-5.10/android-recommended-x86.config delete mode 100644 android-5.10/android-recommended.config delete mode 100644 android-5.15/android-recommended-arm.config delete mode 100644 android-5.15/android-recommended-arm64.config delete mode 100644 android-5.15/android-recommended-x86.config delete mode 100644 android-5.15/android-recommended.config diff --git a/android-5.10/android-recommended-arm.config b/android-5.10/android-recommended-arm.config deleted file mode 100644 index 1ff0342..0000000 --- a/android-5.10/android-recommended-arm.config +++ /dev/null @@ -1,6 +0,0 @@ -# KEEP ALPHABETICALLY SORTED -CONFIG_ARM_CRYPTO=y -CONFIG_CRYPTO_AES_ARM_CE=y -CONFIG_CRYPTO_SHA2_ARM_CE=y -CONFIG_KERNEL_MODE_NEON=y -CONFIG_NEON=y diff --git a/android-5.10/android-recommended-arm64.config b/android-5.10/android-recommended-arm64.config deleted file mode 100644 index 16ec836..0000000 --- a/android-5.10/android-recommended-arm64.config +++ /dev/null @@ -1,7 +0,0 @@ -# KEEP ALPHABETICALLY SORTED -CONFIG_ARM64_CRYPTO=y -CONFIG_ARM64_SW_TTBR0_PAN=y -CONFIG_CRYPTO_AES_ARM64_CE_BLK=y -CONFIG_CRYPTO_SHA2_ARM64_CE=y -CONFIG_RANDOMIZE_BASE=y -CONFIG_RELOCATABLE=y diff --git a/android-5.10/android-recommended-x86.config b/android-5.10/android-recommended-x86.config deleted file mode 100644 index 0388b3f..0000000 --- a/android-5.10/android-recommended-x86.config +++ /dev/null @@ -1,5 +0,0 @@ -# KEEP ALPHABETICALLY SORTED -CONFIG_CRYPTO_AES_NI_INTEL=y -CONFIG_CRYPTO_SHA256_SSSE3=y -CONFIG_RANDOMIZE_BASE=y -CONFIG_RELOCATABLE=y diff --git a/android-5.10/android-recommended.config b/android-5.10/android-recommended.config deleted file mode 100644 index de28508..0000000 --- a/android-5.10/android-recommended.config +++ /dev/null @@ -1,131 +0,0 @@ -# KEEP ALPHABETICALLY SORTED -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_KSM is not set -# CONFIG_LEGACY_PTYS is not set -# CONFIG_NF_CONNTRACK_SIP is not set -# CONFIG_VT is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BLK_DEV_DM=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_COMPACTION=y -CONFIG_CONFIGFS_FS=y -CONFIG_COREDUMP=y -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y -CONFIG_DM_BOW=y -CONFIG_DM_CRYPT=y -CONFIG_DM_UEVENT=y -CONFIG_DM_VERITY_FEC=y -CONFIG_DRAGONRISE_FF=y -CONFIG_ELF_CORE=y -CONFIG_ENABLE_DEFAULT_TRACERS=y -CONFIG_ENERGY_MODEL=y -CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_SECURITY=y -CONFIG_F2FS_FS=y -CONFIG_F2FS_FS_SECURITY=y -CONFIG_FTRACE=y -CONFIG_GREENASIA_FF=y -CONFIG_HIDRAW=y -CONFIG_HID_A4TECH=y -CONFIG_HID_ACRUX=y -CONFIG_HID_ACRUX_FF=y -CONFIG_HID_APPLE=y -CONFIG_HID_BELKIN=y -CONFIG_HID_CHERRY=y -CONFIG_HID_CHICONY=y -CONFIG_HID_CYPRESS=y -CONFIG_HID_DRAGONRISE=y -CONFIG_HID_ELECOM=y -CONFIG_HID_EMS_FF=y -CONFIG_HID_EZKEY=y -CONFIG_HID_GREENASIA=y -CONFIG_HID_GYRATION=y -CONFIG_HID_HOLTEK=y -CONFIG_HID_KENSINGTON=y -CONFIG_HID_KEYTOUCH=y -CONFIG_HID_KYE=y -CONFIG_HID_LCPOWER=y -CONFIG_HID_LOGITECH=y -CONFIG_HID_LOGITECH_DJ=y -CONFIG_HID_MAGICMOUSE=y -CONFIG_HID_MICROSOFT=y -CONFIG_HID_MONTEREY=y -CONFIG_HID_MULTITOUCH=y -CONFIG_HID_NTRIG=y -CONFIG_HID_ORTEK=y -CONFIG_HID_PANTHERLORD=y -CONFIG_HID_PETALYNX=y -CONFIG_HID_PICOLCD=y -CONFIG_HID_PRIMAX=y -CONFIG_HID_PRODIKEYS=y -CONFIG_HID_ROCCAT=y -CONFIG_HID_SAITEK=y -CONFIG_HID_SAMSUNG=y -CONFIG_HID_SMARTJOYPLUS=y -CONFIG_HID_SPEEDLINK=y -CONFIG_HID_STEAM=y -CONFIG_HID_SUNPLUS=y -CONFIG_HID_THRUSTMASTER=y -CONFIG_HID_TIVO=y -CONFIG_HID_TOPSEED=y -CONFIG_HID_TWINHAN=y -CONFIG_HID_UCLOGIC=y -CONFIG_HID_WACOM=y -CONFIG_HID_WALTOP=y -CONFIG_HID_WIIMOTE=y -CONFIG_HID_ZEROPLUS=y -CONFIG_HID_ZYDACRON=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_TABLET=y -CONFIG_INPUT_UINPUT=y -CONFIG_ION=y -CONFIG_JOYSTICK_XPAD_FF=y -CONFIG_JOYSTICK_XPAD_LEDS=y -CONFIG_KALLSYMS=y -CONFIG_KALLSYMS_ALL=y -CONFIG_KEYS=y -CONFIG_LOGIG940_FF=y -CONFIG_LOGIRUMBLEPAD2_FF=y -CONFIG_LOGITECH_FF=y -CONFIG_MEDIA_SUPPORT=y -CONFIG_MISC_FILESYSTEMS=y -CONFIG_MSDOS_FS=y -CONFIG_NET_SCH_NETEM=y -CONFIG_OVERLAY_FS=y -CONFIG_PANIC_TIMEOUT=5 -CONFIG_PANTHERLORD_FF=y -CONFIG_PERF_EVENTS=y -CONFIG_PM_DEBUG=y -CONFIG_POWER_SUPPLY=y -CONFIG_PSI=y -CONFIG_PSTORE=y -CONFIG_PSTORE_CONSOLE=y -CONFIG_PSTORE_RAM=y -CONFIG_REFCOUNT_FULL=y -CONFIG_SCHEDSTATS=y -CONFIG_SDCARD_FS=y -CONFIG_SMARTJOYPLUS_FF=y -CONFIG_SMP=y -CONFIG_SND=y -CONFIG_SOUND=y -CONFIG_STRICT_KERNEL_RWX=y -CONFIG_TABLET_USB_ACECAD=y -CONFIG_TABLET_USB_AIPTEK=y -CONFIG_TABLET_USB_GTCO=y -CONFIG_TABLET_USB_HANWANG=y -CONFIG_TABLET_USB_KBTAB=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_UCLAMP_TASK=y -CONFIG_UCLAMP_TASK_GROUP=y -CONFIG_UPROBE_EVENTS=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_HIDDEV=y -CONFIG_USB_RTL8152=y -CONFIG_USB_USBNET=y -CONFIG_VFAT_FS=y diff --git a/android-5.15/android-recommended-arm.config b/android-5.15/android-recommended-arm.config deleted file mode 100644 index 1ff0342..0000000 --- a/android-5.15/android-recommended-arm.config +++ /dev/null @@ -1,6 +0,0 @@ -# KEEP ALPHABETICALLY SORTED -CONFIG_ARM_CRYPTO=y -CONFIG_CRYPTO_AES_ARM_CE=y -CONFIG_CRYPTO_SHA2_ARM_CE=y -CONFIG_KERNEL_MODE_NEON=y -CONFIG_NEON=y diff --git a/android-5.15/android-recommended-arm64.config b/android-5.15/android-recommended-arm64.config deleted file mode 100644 index 2b96afa..0000000 --- a/android-5.15/android-recommended-arm64.config +++ /dev/null @@ -1,6 +0,0 @@ -# KEEP ALPHABETICALLY SORTED -CONFIG_ARM64_CRYPTO=y -CONFIG_ARM64_SW_TTBR0_PAN=y -CONFIG_CRYPTO_AES_ARM64_CE_BLK=y -CONFIG_CRYPTO_SHA2_ARM64_CE=y -CONFIG_RELOCATABLE=y diff --git a/android-5.15/android-recommended-x86.config b/android-5.15/android-recommended-x86.config deleted file mode 100644 index f528535..0000000 --- a/android-5.15/android-recommended-x86.config +++ /dev/null @@ -1,4 +0,0 @@ -# KEEP ALPHABETICALLY SORTED -CONFIG_CRYPTO_AES_NI_INTEL=y -CONFIG_CRYPTO_SHA256_SSSE3=y -CONFIG_RELOCATABLE=y diff --git a/android-5.15/android-recommended.config b/android-5.15/android-recommended.config deleted file mode 100644 index de28508..0000000 --- a/android-5.15/android-recommended.config +++ /dev/null @@ -1,131 +0,0 @@ -# KEEP ALPHABETICALLY SORTED -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_KSM is not set -# CONFIG_LEGACY_PTYS is not set -# CONFIG_NF_CONNTRACK_SIP is not set -# CONFIG_VT is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BLK_DEV_DM=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_COMPACTION=y -CONFIG_CONFIGFS_FS=y -CONFIG_COREDUMP=y -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y -CONFIG_DM_BOW=y -CONFIG_DM_CRYPT=y -CONFIG_DM_UEVENT=y -CONFIG_DM_VERITY_FEC=y -CONFIG_DRAGONRISE_FF=y -CONFIG_ELF_CORE=y -CONFIG_ENABLE_DEFAULT_TRACERS=y -CONFIG_ENERGY_MODEL=y -CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_SECURITY=y -CONFIG_F2FS_FS=y -CONFIG_F2FS_FS_SECURITY=y -CONFIG_FTRACE=y -CONFIG_GREENASIA_FF=y -CONFIG_HIDRAW=y -CONFIG_HID_A4TECH=y -CONFIG_HID_ACRUX=y -CONFIG_HID_ACRUX_FF=y -CONFIG_HID_APPLE=y -CONFIG_HID_BELKIN=y -CONFIG_HID_CHERRY=y -CONFIG_HID_CHICONY=y -CONFIG_HID_CYPRESS=y -CONFIG_HID_DRAGONRISE=y -CONFIG_HID_ELECOM=y -CONFIG_HID_EMS_FF=y -CONFIG_HID_EZKEY=y -CONFIG_HID_GREENASIA=y -CONFIG_HID_GYRATION=y -CONFIG_HID_HOLTEK=y -CONFIG_HID_KENSINGTON=y -CONFIG_HID_KEYTOUCH=y -CONFIG_HID_KYE=y -CONFIG_HID_LCPOWER=y -CONFIG_HID_LOGITECH=y -CONFIG_HID_LOGITECH_DJ=y -CONFIG_HID_MAGICMOUSE=y -CONFIG_HID_MICROSOFT=y -CONFIG_HID_MONTEREY=y -CONFIG_HID_MULTITOUCH=y -CONFIG_HID_NTRIG=y -CONFIG_HID_ORTEK=y -CONFIG_HID_PANTHERLORD=y -CONFIG_HID_PETALYNX=y -CONFIG_HID_PICOLCD=y -CONFIG_HID_PRIMAX=y -CONFIG_HID_PRODIKEYS=y -CONFIG_HID_ROCCAT=y -CONFIG_HID_SAITEK=y -CONFIG_HID_SAMSUNG=y -CONFIG_HID_SMARTJOYPLUS=y -CONFIG_HID_SPEEDLINK=y -CONFIG_HID_STEAM=y -CONFIG_HID_SUNPLUS=y -CONFIG_HID_THRUSTMASTER=y -CONFIG_HID_TIVO=y -CONFIG_HID_TOPSEED=y -CONFIG_HID_TWINHAN=y -CONFIG_HID_UCLOGIC=y -CONFIG_HID_WACOM=y -CONFIG_HID_WALTOP=y -CONFIG_HID_WIIMOTE=y -CONFIG_HID_ZEROPLUS=y -CONFIG_HID_ZYDACRON=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_TABLET=y -CONFIG_INPUT_UINPUT=y -CONFIG_ION=y -CONFIG_JOYSTICK_XPAD_FF=y -CONFIG_JOYSTICK_XPAD_LEDS=y -CONFIG_KALLSYMS=y -CONFIG_KALLSYMS_ALL=y -CONFIG_KEYS=y -CONFIG_LOGIG940_FF=y -CONFIG_LOGIRUMBLEPAD2_FF=y -CONFIG_LOGITECH_FF=y -CONFIG_MEDIA_SUPPORT=y -CONFIG_MISC_FILESYSTEMS=y -CONFIG_MSDOS_FS=y -CONFIG_NET_SCH_NETEM=y -CONFIG_OVERLAY_FS=y -CONFIG_PANIC_TIMEOUT=5 -CONFIG_PANTHERLORD_FF=y -CONFIG_PERF_EVENTS=y -CONFIG_PM_DEBUG=y -CONFIG_POWER_SUPPLY=y -CONFIG_PSI=y -CONFIG_PSTORE=y -CONFIG_PSTORE_CONSOLE=y -CONFIG_PSTORE_RAM=y -CONFIG_REFCOUNT_FULL=y -CONFIG_SCHEDSTATS=y -CONFIG_SDCARD_FS=y -CONFIG_SMARTJOYPLUS_FF=y -CONFIG_SMP=y -CONFIG_SND=y -CONFIG_SOUND=y -CONFIG_STRICT_KERNEL_RWX=y -CONFIG_TABLET_USB_ACECAD=y -CONFIG_TABLET_USB_AIPTEK=y -CONFIG_TABLET_USB_GTCO=y -CONFIG_TABLET_USB_HANWANG=y -CONFIG_TABLET_USB_KBTAB=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_UCLAMP_TASK=y -CONFIG_UCLAMP_TASK_GROUP=y -CONFIG_UPROBE_EVENTS=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_HIDDEV=y -CONFIG_USB_RTL8152=y -CONFIG_USB_USBNET=y -CONFIG_VFAT_FS=y -- cgit v1.2.3 From a086ca56b05ff01fafb7fa280b978899aa8efadc Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Mon, 25 Apr 2022 18:28:32 -0700 Subject: Freeze T kernel configs. cp -r kernel/configs/android-* kernel/configs/t ... then manually edit target names Android.bp files. Also manually delete the "recommended configs". Test: TH Bug: 230144764 Change-Id: I32e32d34d5e630fba4b8fb7c491b29aee62e5025 --- t/android-5.10/Android.bp | 26 +++ t/android-5.10/android-base-conditional.xml | 236 +++++++++++++++++++++++++ t/android-5.10/android-base.config | 264 ++++++++++++++++++++++++++++ t/android-5.15/Android.bp | 26 +++ t/android-5.15/android-base-conditional.xml | 244 +++++++++++++++++++++++++ t/android-5.15/android-base.config | 264 ++++++++++++++++++++++++++++ 6 files changed, 1060 insertions(+) create mode 100644 t/android-5.10/Android.bp create mode 100644 t/android-5.10/android-base-conditional.xml create mode 100644 t/android-5.10/android-base.config create mode 100644 t/android-5.15/Android.bp create mode 100644 t/android-5.15/android-base-conditional.xml create mode 100644 t/android-5.15/android-base.config diff --git a/t/android-5.10/Android.bp b/t/android-5.10/Android.bp new file mode 100644 index 0000000..4408b53 --- /dev/null +++ b/t/android-5.10/Android.bp @@ -0,0 +1,26 @@ +// Copyright (C) 2022 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package { + // See: http://go/android-license-faq + default_applicable_licenses: ["Android-Apache-2.0"], +} + +kernel_config { + name: "kernel_config_t_5.10", + srcs: [ + "android-base.config", + ], + meta: "android-base-conditional.xml", +} diff --git a/t/android-5.10/android-base-conditional.xml b/t/android-5.10/android-base-conditional.xml new file mode 100644 index 0000000..5815b65 --- /dev/null +++ b/t/android-5.10/android-base-conditional.xml @@ -0,0 +1,236 @@ + + + + + + + + CONFIG_ARM + y + + + + CONFIG_AEABI + y + + + CONFIG_CPU_SW_DOMAIN_PAN + y + + + CONFIG_DEVKMEM + n + + + CONFIG_OABI_COMPAT + n + + + + + + + + CONFIG_ARM64 + y + + + + CONFIG_ARM64_PAN + y + + + CONFIG_ARM64_SW_TTBR0_PAN + y + + + CONFIG_ARMV8_DEPRECATED + y + + + + CONFIG_COMPAT + y + + + CONFIG_CP15_BARRIER_EMULATION + y + + + CONFIG_SETEND_EMULATION + y + + + CONFIG_SHADOW_CALL_STACK + y + + + CONFIG_SWP_EMULATION + y + + + CONFIG_BPF_JIT_ALWAYS_ON + y + + + CONFIG_HAVE_MOVE_PMD + y + + + CONFIG_HAVE_MOVE_PUD + y + + + CONFIG_KFENCE + y + + + CONFIG_USERFAULTFD + y + + + + + + + + CONFIG_X86 + y + + + + CONFIG_DEVKMEM + n + + + CONFIG_KFENCE + y + + + CONFIG_PAGE_TABLE_ISOLATION + y + + + CONFIG_RETPOLINE + y + + + CONFIG_HAVE_MOVE_PMD + y + + + CONFIG_HAVE_MOVE_PUD + y + + + CONFIG_USERFAULTFD + y + + + + + + + + CONFIG_X86_64 + y + + + + + CONFIG_BPF_JIT_ALWAYS_ON + y + + + + + + + + CONFIG_ACPI + n + + + + CONFIG_OF + y + + + + + + CONFIG_OF + n + + + + CONFIG_ACPI + y + + + + + + + + CONFIG_EXT4_FS + y + + + + CONFIG_EXT4_FS_POSIX_ACL + y + + + + + + + + CONFIG_F2FS_FS + y + + + + CONFIG_F2FS_FS_POSIX_ACL + y + + + + + + + + CONFIG_HAVE_ARCH_VMAP_STACK + y + + + CONFIG_KASAN_SW_TAGS + n + + + + CONFIG_VMAP_STACK + y + + + + + + + + CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO + y + + + + CONFIG_INIT_STACK_ALL_ZERO + y + + diff --git a/t/android-5.10/android-base.config b/t/android-5.10/android-base.config new file mode 100644 index 0000000..42eb70f --- /dev/null +++ b/t/android-5.10/android-base.config @@ -0,0 +1,264 @@ +# KEEP ALPHABETICALLY SORTED +# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set +# CONFIG_ANDROID_PARANOID_NETWORK is not set +# CONFIG_BPFILTER is not set +# CONFIG_DEVMEM is not set +# CONFIG_FHANDLE is not set +# CONFIG_FW_CACHE is not set +# CONFIG_IP6_NF_NAT is not set +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_NFSD is not set +# CONFIG_NFS_FS is not set +# CONFIG_PM_AUTOSLEEP is not set +# CONFIG_RT_GROUP_SCHED is not set +# CONFIG_SYSVIPC is not set +# CONFIG_USELIB is not set +CONFIG_ADVISE_SYSCALLS=y +CONFIG_AIO=y +CONFIG_ANDROID=y +CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder" +CONFIG_ANDROID_BINDER_IPC=y +CONFIG_ANDROID_BINDERFS=y +CONFIG_ASHMEM=y +CONFIG_AS_IS_LLVM=y +CONFIG_AUDIT=y +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_SCRIPT=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_INLINE_ENCRYPTION=y +CONFIG_BLOCK=y +CONFIG_BPF_JIT=y +CONFIG_BPF_SYSCALL=y +CONFIG_CC_IS_CLANG=y +CONFIG_CGROUPS=y +CONFIG_CGROUP_BPF=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_SCHED=y +CONFIG_CROSS_MEMORY_ATTACH=y +CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CHACHA20POLY1305=y +CONFIG_CRYPTO_CMAC=y +CONFIG_CRYPTO_CTR=y +CONFIG_CRYPTO_ECB=y +CONFIG_CRYPTO_GCM=y +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_NULL=y +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=y +CONFIG_CRYPTO_XCBC=y +CONFIG_DEBUG_LIST=y +CONFIG_DEFAULT_SECURITY_SELINUX=y +CONFIG_DM_DEFAULT_KEY=y +CONFIG_DM_SNAPSHOT=y +CONFIG_DM_VERITY=y +CONFIG_DUMMY=y +CONFIG_EMBEDDED=y +CONFIG_EPOLL=y +CONFIG_EVENTFD=y +CONFIG_FILE_LOCKING=y +CONFIG_FS_ENCRYPTION=y +CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y +CONFIG_FS_VERITY=y +CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y +CONFIG_FUSE_FS=y +CONFIG_FUTEX=y +CONFIG_HARDENED_USERCOPY=y +CONFIG_HID_GENERIC=y +CONFIG_HID_PLAYSTATION=y +CONFIG_PLAYSTATION_FF=y +CONFIG_HIDRAW=y +CONFIG_HID_SONY=y +CONFIG_SONY_FF=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_INET6_ESP=y +CONFIG_INET6_IPCOMP=y +CONFIG_INET=y +CONFIG_INET_DIAG_DESTROY=y +CONFIG_INET_ESP=y +CONFIG_INET_UDP_DIAG=y +CONFIG_INOTIFY_USER=y +CONFIG_INPUT=y +CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_JOYSTICK=y +CONFIG_IP6_NF_FILTER=y +CONFIG_IP6_NF_IPTABLES=y +CONFIG_IP6_NF_MANGLE=y +CONFIG_IP6_NF_MATCH_RPFILTER=y +CONFIG_IP6_NF_RAW=y +CONFIG_IP6_NF_TARGET_REJECT=y +CONFIG_IPV6=y +CONFIG_IPV6_MIP6=y +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_VTI=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_NF_ARPFILTER=y +CONFIG_IP_NF_ARPTABLES=y +CONFIG_IP_NF_ARP_MANGLE=y +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_MANGLE=y +CONFIG_IP_NF_MATCH_ECN=y +CONFIG_IP_NF_MATCH_TTL=y +CONFIG_IP_NF_NAT=y +CONFIG_IP_NF_RAW=y +CONFIG_IP_NF_SECURITY=y +CONFIG_IP_NF_TARGET_MASQUERADE=y +CONFIG_IP_NF_TARGET_NETMAP=y +CONFIG_IP_NF_TARGET_REDIRECT=y +CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_JOYSTICK_XPAD=y +CONFIG_L2TP=y +CONFIG_LD_IS_LLD=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_MD=y +CONFIG_MEMBARRIER=y +CONFIG_MMU=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_MULTIUSER=y +CONFIG_NAMESPACES=y +CONFIG_NET=y +CONFIG_NETDEVICES=y +CONFIG_NETFILTER=y +CONFIG_NETFILTER_XT_MATCH_BPF=y +CONFIG_NETFILTER_XT_MATCH_COMMENT=y +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y +CONFIG_NETFILTER_XT_MATCH_CONNMARK=y +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y +CONFIG_NETFILTER_XT_MATCH_HELPER=y +CONFIG_NETFILTER_XT_MATCH_IPRANGE=y +CONFIG_NETFILTER_XT_MATCH_LENGTH=y +CONFIG_NETFILTER_XT_MATCH_LIMIT=y +CONFIG_NETFILTER_XT_MATCH_MAC=y +CONFIG_NETFILTER_XT_MATCH_MARK=y +CONFIG_NETFILTER_XT_MATCH_OWNER=y +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y +CONFIG_NETFILTER_XT_MATCH_POLICY=y +CONFIG_NETFILTER_XT_MATCH_QUOTA2=y +CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y +CONFIG_NETFILTER_XT_MATCH_QUOTA=y +CONFIG_NETFILTER_XT_MATCH_SOCKET=y +CONFIG_NETFILTER_XT_MATCH_STATE=y +CONFIG_NETFILTER_XT_MATCH_STATISTIC=y +CONFIG_NETFILTER_XT_MATCH_STRING=y +CONFIG_NETFILTER_XT_MATCH_TIME=y +CONFIG_NETFILTER_XT_MATCH_U32=y +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y +CONFIG_NETFILTER_XT_TARGET_CONNMARK=y +CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y +CONFIG_NETFILTER_XT_TARGET_CT=y +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y +CONFIG_NETFILTER_XT_TARGET_MARK=y +CONFIG_NETFILTER_XT_TARGET_NFLOG=y +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y +CONFIG_NETFILTER_XT_TARGET_SECMARK=y +CONFIG_NETFILTER_XT_TARGET_TCPMSS=y +CONFIG_NETFILTER_XT_TARGET_TPROXY=y +CONFIG_NETFILTER_XT_TARGET_TRACE=y +CONFIG_NET_CLS_ACT=y +CONFIG_NET_CLS_BPF=y +CONFIG_NET_CLS_U32=y +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_U32=y +CONFIG_NET_IPGRE_DEMUX=y +CONFIG_NET_IPVTI=y +CONFIG_NET_KEY=y +CONFIG_NET_NS=y +CONFIG_NET_SCHED=y +CONFIG_NET_SCH_HTB=y +CONFIG_NET_SCH_INGRESS=y +CONFIG_NF_CONNTRACK=y +CONFIG_NF_CONNTRACK_AMANDA=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CONNTRACK_FTP=y +CONFIG_NF_CONNTRACK_H323=y +CONFIG_NF_CONNTRACK_IRC=y +CONFIG_NF_CONNTRACK_NETBIOS_NS=y +CONFIG_NF_CONNTRACK_PPTP=y +CONFIG_NF_CONNTRACK_SANE=y +CONFIG_NF_CONNTRACK_SECMARK=y +CONFIG_NF_CONNTRACK_TFTP=y +CONFIG_NF_CT_NETLINK=y +CONFIG_NF_CT_PROTO_DCCP=y +CONFIG_NF_CT_PROTO_SCTP=y +CONFIG_NF_CT_PROTO_UDPLITE=y +CONFIG_NF_NAT=y +CONFIG_NF_SOCKET_IPV4=y +CONFIG_NF_SOCKET_IPV6=y +CONFIG_NO_HZ=y +CONFIG_PACKET=y +CONFIG_PM_WAKELOCKS=y +CONFIG_POSIX_TIMERS=y +CONFIG_PPP=y +CONFIG_PPPOL2TP=y +CONFIG_PPP_BSDCOMP=y +CONFIG_PPP_DEFLATE=y +CONFIG_PPP_MPPE=y +CONFIG_PPTP=y +CONFIG_PREEMPT=y +CONFIG_PROC_FS=y +CONFIG_PROFILING=y +CONFIG_PSI=y +CONFIG_QFMT_V2=y +CONFIG_QUOTA=y +CONFIG_QUOTACTL=y +CONFIG_RD_LZ4=y +CONFIG_RTC_CLASS=y +CONFIG_SCHED_DEBUG=y +CONFIG_SECCOMP=y +CONFIG_SECCOMP_FILTER=y +CONFIG_SECURITY=y +CONFIG_SECURITY_NETWORK=y +CONFIG_SECURITY_SELINUX=y +CONFIG_SHMEM=y +CONFIG_SIGNALFD=y +CONFIG_SND=y +CONFIG_SOUND=y +CONFIG_STACKPROTECTOR=y +CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_STAGING=y +CONFIG_STATIC_USERMODEHELPER=y +CONFIG_STRICT_KERNEL_RWX=y +CONFIG_STRICT_MODULE_RWX=y +CONFIG_SUSPEND=y +CONFIG_SYNC_FILE=y +CONFIG_SYSFS=y +CONFIG_TASKSTATS=y +CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_TASK_XACCT=y +CONFIG_TIMERFD=y +CONFIG_TRACE_GPU_MEM=y +CONFIG_TTY=y +CONFIG_TUN=y +CONFIG_UHID=y +CONFIG_UID_SYS_STATS=y +CONFIG_UNIX=y +CONFIG_USB=y +CONFIG_USB_CONFIGFS=y +CONFIG_USB_CONFIGFS_F_ACC=y +CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y +CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_USB_CONFIGFS_F_MIDI=y +CONFIG_USB_CONFIGFS_UEVENT=y +CONFIG_USB_GADGET=y +CONFIG_USB_SUPPORT=y +CONFIG_UTS_NS=y +CONFIG_VETH=y +CONFIG_XFRM_INTERFACE=y +CONFIG_XFRM_MIGRATE=y +CONFIG_XFRM_STATISTICS=y +CONFIG_XFRM_USER=y diff --git a/t/android-5.15/Android.bp b/t/android-5.15/Android.bp new file mode 100644 index 0000000..f3f55a6 --- /dev/null +++ b/t/android-5.15/Android.bp @@ -0,0 +1,26 @@ +// Copyright (C) 2022 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package { + // See: http://go/android-license-faq + default_applicable_licenses: ["Android-Apache-2.0"], +} + +kernel_config { + name: "kernel_config_t_5.15", + srcs: [ + "android-base.config", + ], + meta: "android-base-conditional.xml", +} diff --git a/t/android-5.15/android-base-conditional.xml b/t/android-5.15/android-base-conditional.xml new file mode 100644 index 0000000..c58d3b1 --- /dev/null +++ b/t/android-5.15/android-base-conditional.xml @@ -0,0 +1,244 @@ + + + + + + + + CONFIG_ARM + y + + + + CONFIG_AEABI + y + + + CONFIG_CPU_SW_DOMAIN_PAN + y + + + CONFIG_DEVKMEM + n + + + CONFIG_OABI_COMPAT + n + + + + + + + + CONFIG_ARM64 + y + + + + CONFIG_ARM64_PAN + y + + + CONFIG_ARM64_SW_TTBR0_PAN + y + + + CONFIG_ARMV8_DEPRECATED + y + + + + CONFIG_COMPAT + y + + + CONFIG_CP15_BARRIER_EMULATION + y + + + CONFIG_RANDOMIZE_BASE + y + + + CONFIG_SETEND_EMULATION + y + + + CONFIG_SHADOW_CALL_STACK + y + + + CONFIG_SWP_EMULATION + y + + + CONFIG_BPF_JIT_ALWAYS_ON + y + + + CONFIG_HAVE_MOVE_PMD + y + + + CONFIG_HAVE_MOVE_PUD + y + + + CONFIG_KFENCE + y + + + CONFIG_USERFAULTFD + y + + + + + + + + CONFIG_X86 + y + + + + CONFIG_DEVKMEM + n + + + CONFIG_KFENCE + y + + + CONFIG_PAGE_TABLE_ISOLATION + y + + + CONFIG_RETPOLINE + y + + + CONFIG_HAVE_MOVE_PMD + y + + + CONFIG_HAVE_MOVE_PUD + y + + + CONFIG_RANDOMIZE_BASE + y + + + CONFIG_USERFAULTFD + y + + + + + + + + CONFIG_X86_64 + y + + + + + CONFIG_BPF_JIT_ALWAYS_ON + y + + + + + + + + CONFIG_ACPI + n + + + + CONFIG_OF + y + + + + + + CONFIG_OF + n + + + + CONFIG_ACPI + y + + + + + + + + CONFIG_EXT4_FS + y + + + + CONFIG_EXT4_FS_POSIX_ACL + y + + + + + + + + CONFIG_F2FS_FS + y + + + + CONFIG_F2FS_FS_POSIX_ACL + y + + + + + + + + CONFIG_HAVE_ARCH_VMAP_STACK + y + + + CONFIG_KASAN_SW_TAGS + n + + + + CONFIG_VMAP_STACK + y + + + + + + + + CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO + y + + + + CONFIG_INIT_STACK_ALL_ZERO + y + + diff --git a/t/android-5.15/android-base.config b/t/android-5.15/android-base.config new file mode 100644 index 0000000..42eb70f --- /dev/null +++ b/t/android-5.15/android-base.config @@ -0,0 +1,264 @@ +# KEEP ALPHABETICALLY SORTED +# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set +# CONFIG_ANDROID_PARANOID_NETWORK is not set +# CONFIG_BPFILTER is not set +# CONFIG_DEVMEM is not set +# CONFIG_FHANDLE is not set +# CONFIG_FW_CACHE is not set +# CONFIG_IP6_NF_NAT is not set +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_NFSD is not set +# CONFIG_NFS_FS is not set +# CONFIG_PM_AUTOSLEEP is not set +# CONFIG_RT_GROUP_SCHED is not set +# CONFIG_SYSVIPC is not set +# CONFIG_USELIB is not set +CONFIG_ADVISE_SYSCALLS=y +CONFIG_AIO=y +CONFIG_ANDROID=y +CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder" +CONFIG_ANDROID_BINDER_IPC=y +CONFIG_ANDROID_BINDERFS=y +CONFIG_ASHMEM=y +CONFIG_AS_IS_LLVM=y +CONFIG_AUDIT=y +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_SCRIPT=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_INLINE_ENCRYPTION=y +CONFIG_BLOCK=y +CONFIG_BPF_JIT=y +CONFIG_BPF_SYSCALL=y +CONFIG_CC_IS_CLANG=y +CONFIG_CGROUPS=y +CONFIG_CGROUP_BPF=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_SCHED=y +CONFIG_CROSS_MEMORY_ATTACH=y +CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CHACHA20POLY1305=y +CONFIG_CRYPTO_CMAC=y +CONFIG_CRYPTO_CTR=y +CONFIG_CRYPTO_ECB=y +CONFIG_CRYPTO_GCM=y +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_NULL=y +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=y +CONFIG_CRYPTO_XCBC=y +CONFIG_DEBUG_LIST=y +CONFIG_DEFAULT_SECURITY_SELINUX=y +CONFIG_DM_DEFAULT_KEY=y +CONFIG_DM_SNAPSHOT=y +CONFIG_DM_VERITY=y +CONFIG_DUMMY=y +CONFIG_EMBEDDED=y +CONFIG_EPOLL=y +CONFIG_EVENTFD=y +CONFIG_FILE_LOCKING=y +CONFIG_FS_ENCRYPTION=y +CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y +CONFIG_FS_VERITY=y +CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y +CONFIG_FUSE_FS=y +CONFIG_FUTEX=y +CONFIG_HARDENED_USERCOPY=y +CONFIG_HID_GENERIC=y +CONFIG_HID_PLAYSTATION=y +CONFIG_PLAYSTATION_FF=y +CONFIG_HIDRAW=y +CONFIG_HID_SONY=y +CONFIG_SONY_FF=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_INET6_ESP=y +CONFIG_INET6_IPCOMP=y +CONFIG_INET=y +CONFIG_INET_DIAG_DESTROY=y +CONFIG_INET_ESP=y +CONFIG_INET_UDP_DIAG=y +CONFIG_INOTIFY_USER=y +CONFIG_INPUT=y +CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_JOYSTICK=y +CONFIG_IP6_NF_FILTER=y +CONFIG_IP6_NF_IPTABLES=y +CONFIG_IP6_NF_MANGLE=y +CONFIG_IP6_NF_MATCH_RPFILTER=y +CONFIG_IP6_NF_RAW=y +CONFIG_IP6_NF_TARGET_REJECT=y +CONFIG_IPV6=y +CONFIG_IPV6_MIP6=y +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_VTI=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_NF_ARPFILTER=y +CONFIG_IP_NF_ARPTABLES=y +CONFIG_IP_NF_ARP_MANGLE=y +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_MANGLE=y +CONFIG_IP_NF_MATCH_ECN=y +CONFIG_IP_NF_MATCH_TTL=y +CONFIG_IP_NF_NAT=y +CONFIG_IP_NF_RAW=y +CONFIG_IP_NF_SECURITY=y +CONFIG_IP_NF_TARGET_MASQUERADE=y +CONFIG_IP_NF_TARGET_NETMAP=y +CONFIG_IP_NF_TARGET_REDIRECT=y +CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_JOYSTICK_XPAD=y +CONFIG_L2TP=y +CONFIG_LD_IS_LLD=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_MD=y +CONFIG_MEMBARRIER=y +CONFIG_MMU=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_MULTIUSER=y +CONFIG_NAMESPACES=y +CONFIG_NET=y +CONFIG_NETDEVICES=y +CONFIG_NETFILTER=y +CONFIG_NETFILTER_XT_MATCH_BPF=y +CONFIG_NETFILTER_XT_MATCH_COMMENT=y +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y +CONFIG_NETFILTER_XT_MATCH_CONNMARK=y +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y +CONFIG_NETFILTER_XT_MATCH_HELPER=y +CONFIG_NETFILTER_XT_MATCH_IPRANGE=y +CONFIG_NETFILTER_XT_MATCH_LENGTH=y +CONFIG_NETFILTER_XT_MATCH_LIMIT=y +CONFIG_NETFILTER_XT_MATCH_MAC=y +CONFIG_NETFILTER_XT_MATCH_MARK=y +CONFIG_NETFILTER_XT_MATCH_OWNER=y +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y +CONFIG_NETFILTER_XT_MATCH_POLICY=y +CONFIG_NETFILTER_XT_MATCH_QUOTA2=y +CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y +CONFIG_NETFILTER_XT_MATCH_QUOTA=y +CONFIG_NETFILTER_XT_MATCH_SOCKET=y +CONFIG_NETFILTER_XT_MATCH_STATE=y +CONFIG_NETFILTER_XT_MATCH_STATISTIC=y +CONFIG_NETFILTER_XT_MATCH_STRING=y +CONFIG_NETFILTER_XT_MATCH_TIME=y +CONFIG_NETFILTER_XT_MATCH_U32=y +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y +CONFIG_NETFILTER_XT_TARGET_CONNMARK=y +CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y +CONFIG_NETFILTER_XT_TARGET_CT=y +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y +CONFIG_NETFILTER_XT_TARGET_MARK=y +CONFIG_NETFILTER_XT_TARGET_NFLOG=y +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y +CONFIG_NETFILTER_XT_TARGET_SECMARK=y +CONFIG_NETFILTER_XT_TARGET_TCPMSS=y +CONFIG_NETFILTER_XT_TARGET_TPROXY=y +CONFIG_NETFILTER_XT_TARGET_TRACE=y +CONFIG_NET_CLS_ACT=y +CONFIG_NET_CLS_BPF=y +CONFIG_NET_CLS_U32=y +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_U32=y +CONFIG_NET_IPGRE_DEMUX=y +CONFIG_NET_IPVTI=y +CONFIG_NET_KEY=y +CONFIG_NET_NS=y +CONFIG_NET_SCHED=y +CONFIG_NET_SCH_HTB=y +CONFIG_NET_SCH_INGRESS=y +CONFIG_NF_CONNTRACK=y +CONFIG_NF_CONNTRACK_AMANDA=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CONNTRACK_FTP=y +CONFIG_NF_CONNTRACK_H323=y +CONFIG_NF_CONNTRACK_IRC=y +CONFIG_NF_CONNTRACK_NETBIOS_NS=y +CONFIG_NF_CONNTRACK_PPTP=y +CONFIG_NF_CONNTRACK_SANE=y +CONFIG_NF_CONNTRACK_SECMARK=y +CONFIG_NF_CONNTRACK_TFTP=y +CONFIG_NF_CT_NETLINK=y +CONFIG_NF_CT_PROTO_DCCP=y +CONFIG_NF_CT_PROTO_SCTP=y +CONFIG_NF_CT_PROTO_UDPLITE=y +CONFIG_NF_NAT=y +CONFIG_NF_SOCKET_IPV4=y +CONFIG_NF_SOCKET_IPV6=y +CONFIG_NO_HZ=y +CONFIG_PACKET=y +CONFIG_PM_WAKELOCKS=y +CONFIG_POSIX_TIMERS=y +CONFIG_PPP=y +CONFIG_PPPOL2TP=y +CONFIG_PPP_BSDCOMP=y +CONFIG_PPP_DEFLATE=y +CONFIG_PPP_MPPE=y +CONFIG_PPTP=y +CONFIG_PREEMPT=y +CONFIG_PROC_FS=y +CONFIG_PROFILING=y +CONFIG_PSI=y +CONFIG_QFMT_V2=y +CONFIG_QUOTA=y +CONFIG_QUOTACTL=y +CONFIG_RD_LZ4=y +CONFIG_RTC_CLASS=y +CONFIG_SCHED_DEBUG=y +CONFIG_SECCOMP=y +CONFIG_SECCOMP_FILTER=y +CONFIG_SECURITY=y +CONFIG_SECURITY_NETWORK=y +CONFIG_SECURITY_SELINUX=y +CONFIG_SHMEM=y +CONFIG_SIGNALFD=y +CONFIG_SND=y +CONFIG_SOUND=y +CONFIG_STACKPROTECTOR=y +CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_STAGING=y +CONFIG_STATIC_USERMODEHELPER=y +CONFIG_STRICT_KERNEL_RWX=y +CONFIG_STRICT_MODULE_RWX=y +CONFIG_SUSPEND=y +CONFIG_SYNC_FILE=y +CONFIG_SYSFS=y +CONFIG_TASKSTATS=y +CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_TASK_XACCT=y +CONFIG_TIMERFD=y +CONFIG_TRACE_GPU_MEM=y +CONFIG_TTY=y +CONFIG_TUN=y +CONFIG_UHID=y +CONFIG_UID_SYS_STATS=y +CONFIG_UNIX=y +CONFIG_USB=y +CONFIG_USB_CONFIGFS=y +CONFIG_USB_CONFIGFS_F_ACC=y +CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y +CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_USB_CONFIGFS_F_MIDI=y +CONFIG_USB_CONFIGFS_UEVENT=y +CONFIG_USB_GADGET=y +CONFIG_USB_SUPPORT=y +CONFIG_UTS_NS=y +CONFIG_VETH=y +CONFIG_XFRM_INTERFACE=y +CONFIG_XFRM_MIGRATE=y +CONFIG_XFRM_STATISTICS=y +CONFIG_XFRM_USER=y -- cgit v1.2.3 From 73d722613f43e67fa328c17e7b07314967abc38f Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Wed, 27 Apr 2022 12:50:46 -0700 Subject: Freeze kernel min LTS version. - 5.10.107 - 5.15.41 Test: TH Bug: 230144764 Change-Id: I1ec7b5b7fcc7bf6c8b189b37f2b063cf250fec76 --- t/android-5.10/android-base-conditional.xml | 2 +- t/android-5.15/android-base-conditional.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/t/android-5.10/android-base-conditional.xml b/t/android-5.10/android-base-conditional.xml index 5815b65..db24e7f 100644 --- a/t/android-5.10/android-base-conditional.xml +++ b/t/android-5.10/android-base-conditional.xml @@ -1,4 +1,4 @@ - + diff --git a/t/android-5.15/android-base-conditional.xml b/t/android-5.15/android-base-conditional.xml index c58d3b1..3e76ae6 100644 --- a/t/android-5.15/android-base-conditional.xml +++ b/t/android-5.15/android-base-conditional.xml @@ -1,4 +1,4 @@ - + -- cgit v1.2.3 From 0dd2a872138a1fbd451f91175cbbdc8389d9aaec Mon Sep 17 00:00:00 2001 From: Patrick Rohr Date: Mon, 18 Oct 2021 16:06:28 +0200 Subject: require modules required for bandwidth limiting on 5.10+ T+ Test: TreeHugger Bug: 157552970 Change-Id: I0095f5dbddc915e41efd5a7a8cdab5c34c5cf946 (cherry picked from commit d3c4f1712445903effc55503f059c787ebbd486c) Merged-In: I0095f5dbddc915e41efd5a7a8cdab5c34c5cf946 --- android-5.10/android-base.config | 4 ++++ android-5.15/android-base.config | 4 ++++ t/android-5.10/android-base.config | 4 ++++ t/android-5.15/android-base.config | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/android-5.10/android-base.config b/android-5.10/android-base.config index 42eb70f..52bf43d 100644 --- a/android-5.10/android-base.config +++ b/android-5.10/android-base.config @@ -169,8 +169,11 @@ CONFIG_NETFILTER_XT_TARGET_SECMARK=y CONFIG_NETFILTER_XT_TARGET_TCPMSS=y CONFIG_NETFILTER_XT_TARGET_TPROXY=y CONFIG_NETFILTER_XT_TARGET_TRACE=y +CONFIG_NET_ACT_POLICE=y +CONFIG_NET_ACT_BPF=y CONFIG_NET_CLS_ACT=y CONFIG_NET_CLS_BPF=y +CONFIG_NET_CLS_MATCHALL=y CONFIG_NET_CLS_U32=y CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_U32=y @@ -181,6 +184,7 @@ CONFIG_NET_NS=y CONFIG_NET_SCHED=y CONFIG_NET_SCH_HTB=y CONFIG_NET_SCH_INGRESS=y +CONFIG_NET_SCH_TBF=y CONFIG_NF_CONNTRACK=y CONFIG_NF_CONNTRACK_AMANDA=y CONFIG_NF_CONNTRACK_EVENTS=y diff --git a/android-5.15/android-base.config b/android-5.15/android-base.config index 42eb70f..5ce4ef6 100644 --- a/android-5.15/android-base.config +++ b/android-5.15/android-base.config @@ -169,9 +169,12 @@ CONFIG_NETFILTER_XT_TARGET_SECMARK=y CONFIG_NETFILTER_XT_TARGET_TCPMSS=y CONFIG_NETFILTER_XT_TARGET_TPROXY=y CONFIG_NETFILTER_XT_TARGET_TRACE=y +CONFIG_NET_ACT_POLICE=y +CONFIG_NET_ACT_BPF=y CONFIG_NET_CLS_ACT=y CONFIG_NET_CLS_BPF=y CONFIG_NET_CLS_U32=y +CONFIG_NET_CLS_MATCHALL=y CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_U32=y CONFIG_NET_IPGRE_DEMUX=y @@ -181,6 +184,7 @@ CONFIG_NET_NS=y CONFIG_NET_SCHED=y CONFIG_NET_SCH_HTB=y CONFIG_NET_SCH_INGRESS=y +CONFIG_NET_SCH_TBF=y CONFIG_NF_CONNTRACK=y CONFIG_NF_CONNTRACK_AMANDA=y CONFIG_NF_CONNTRACK_EVENTS=y diff --git a/t/android-5.10/android-base.config b/t/android-5.10/android-base.config index 42eb70f..52bf43d 100644 --- a/t/android-5.10/android-base.config +++ b/t/android-5.10/android-base.config @@ -169,8 +169,11 @@ CONFIG_NETFILTER_XT_TARGET_SECMARK=y CONFIG_NETFILTER_XT_TARGET_TCPMSS=y CONFIG_NETFILTER_XT_TARGET_TPROXY=y CONFIG_NETFILTER_XT_TARGET_TRACE=y +CONFIG_NET_ACT_POLICE=y +CONFIG_NET_ACT_BPF=y CONFIG_NET_CLS_ACT=y CONFIG_NET_CLS_BPF=y +CONFIG_NET_CLS_MATCHALL=y CONFIG_NET_CLS_U32=y CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_U32=y @@ -181,6 +184,7 @@ CONFIG_NET_NS=y CONFIG_NET_SCHED=y CONFIG_NET_SCH_HTB=y CONFIG_NET_SCH_INGRESS=y +CONFIG_NET_SCH_TBF=y CONFIG_NF_CONNTRACK=y CONFIG_NF_CONNTRACK_AMANDA=y CONFIG_NF_CONNTRACK_EVENTS=y diff --git a/t/android-5.15/android-base.config b/t/android-5.15/android-base.config index 42eb70f..5ce4ef6 100644 --- a/t/android-5.15/android-base.config +++ b/t/android-5.15/android-base.config @@ -169,9 +169,12 @@ CONFIG_NETFILTER_XT_TARGET_SECMARK=y CONFIG_NETFILTER_XT_TARGET_TCPMSS=y CONFIG_NETFILTER_XT_TARGET_TPROXY=y CONFIG_NETFILTER_XT_TARGET_TRACE=y +CONFIG_NET_ACT_POLICE=y +CONFIG_NET_ACT_BPF=y CONFIG_NET_CLS_ACT=y CONFIG_NET_CLS_BPF=y CONFIG_NET_CLS_U32=y +CONFIG_NET_CLS_MATCHALL=y CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_U32=y CONFIG_NET_IPGRE_DEMUX=y @@ -181,6 +184,7 @@ CONFIG_NET_NS=y CONFIG_NET_SCHED=y CONFIG_NET_SCH_HTB=y CONFIG_NET_SCH_INGRESS=y +CONFIG_NET_SCH_TBF=y CONFIG_NF_CONNTRACK=y CONFIG_NF_CONNTRACK_AMANDA=y CONFIG_NF_CONNTRACK_EVENTS=y -- cgit v1.2.3 From 1e332fbbf49dc471b67147492a898e06b1fd3d81 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Tue, 16 Aug 2022 11:47:38 -0700 Subject: Update owners list. - ghackmann (left team) - smuckle (left team) + elsk (VINTF owner) Test: none Bug: none Change-Id: Ib3294fea2c14d2ec5543ccbc47399e1b0dc2e90e Signed-off-by: Yifan Hong --- OWNERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OWNERS b/OWNERS index 067022c..1a06593 100644 --- a/OWNERS +++ b/OWNERS @@ -1,6 +1,5 @@ adelva@google.com -ghackmann@google.com +elsk@google.com gregkh@google.com -smuckle@google.com sspatil@google.com tkjos@google.com -- cgit v1.2.3 From 70cbf8a74e70701a6c64f9fc6a43907439546a40 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Fri, 19 Aug 2022 12:19:30 -0700 Subject: Update owners. - gregkh Test: none Change-Id: Iec55bacffd002b58060fbc6e236531f740561adf Signed-off-by: Yifan Hong --- OWNERS | 1 - 1 file changed, 1 deletion(-) diff --git a/OWNERS b/OWNERS index 1a06593..ea62c47 100644 --- a/OWNERS +++ b/OWNERS @@ -1,5 +1,4 @@ adelva@google.com elsk@google.com -gregkh@google.com sspatil@google.com tkjos@google.com -- cgit v1.2.3