diff options
45 files changed, 657 insertions, 799 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..af5c292 --- /dev/null +++ b/Android.bp @@ -0,0 +1,42 @@ +// +// Copyright (C) 2021 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 { + default_applicable_licenses: ["kernel_configs_license"], +} + +// Added automatically by a large-scale-change that took the approach of +// 'apply every license found to every target'. While this makes sure we respect +// every license restriction, it may not be entirely correct. +// +// e.g. GPL in an MIT project might only apply to the contrib/ directory. +// +// Please consider splitting the single license below into multiple licenses, +// taking care not to lose any license_kind information, and overriding the +// default license using the 'licenses: [...]' property on targets as needed. +// +// For unused files, consider creating a 'fileGroup' with "//visibility:private" +// to attach the license to, and including a comment whether the files may be +// used in the current project. +// See: http://go/android-license-faq +license { + name: "kernel_configs_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "legacy_notice", + ], + // large-scale-change unable to identify any license_text files +} @@ -171,7 +171,7 @@ be frozen. Follow the following steps For example, change `kernel_config_current_4.9` in `q/android-4.9/Android.bp` to `kernel_config_q_4.9` * Under `hardware/interfaces/compatibility_matrices/Android.bp`, edit - `kernel_configs` field for the `framework_compatibility_matrix.current.xml` + `kernel_config` field for the `framework_compatibility_matrix.current.xml` to use the new modules. * `framework_compatibility_matrix.current.xml` will be renamed to `framework_compatibility_matrix.<level>.xml` as part of the FCM Version diff --git a/t/android-5.15/Android.bp b/android-4.19/Android.bp index f3f55a6..497baa0 100644 --- a/t/android-5.15/Android.bp +++ b/android-4.19/Android.bp @@ -1,4 +1,4 @@ -// Copyright (C) 2022 The Android Open Source Project +// Copyright (C) 2018 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. @@ -14,13 +14,21 @@ package { // See: http://go/android-license-faq - default_applicable_licenses: ["Android-Apache-2.0"], + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "kernel_configs_license" + // to get the below license kinds: + // legacy_notice + default_applicable_licenses: ["kernel_configs_license"], } kernel_config { - name: "kernel_config_t_5.15", + name: "kernel_config_current_4.19", srcs: [ "android-base.config", + "non_debuggable.config", + ], + debuggable_srcs: [ + "android-base.config", ], meta: "android-base-conditional.xml", } diff --git a/android-5.15/android-base-conditional.xml b/android-4.19/android-base-conditional.xml index 11d3d95..02c3b2d 100644 --- a/android-5.15/android-base-conditional.xml +++ b/android-4.19/android-base-conditional.xml @@ -1,4 +1,4 @@ -<kernel minlts="5.15.0" /> +<kernel minlts="4.19.0" /> <!-- KEEP ALPHABETICALLY SORTED --> <!-- ARM base requirements --> @@ -47,10 +47,6 @@ <key>CONFIG_ARMV8_DEPRECATED</key> <value type="bool">y</value> </config> - <!--<config> - <key>CONFIG_CFI_CLANG</key> - <value type="bool">y</value> - </config>--> <config> <key>CONFIG_COMPAT</key> <value type="bool">y</value> @@ -60,18 +56,10 @@ <value type="bool">y</value> </config> <config> - <key>CONFIG_RANDOMIZE_BASE</key> - <value type="bool">y</value> - </config> - <config> <key>CONFIG_SETEND_EMULATION</key> <value type="bool">y</value> </config> <config> - <key>CONFIG_SHADOW_CALL_STACK</key> - <value type="bool">y</value> - </config> - <config> <key>CONFIG_SWP_EMULATION</key> <value type="bool">y</value> </config> @@ -79,22 +67,6 @@ <key>CONFIG_BPF_JIT_ALWAYS_ON</key> <value type="bool">y</value> </config> - <config> - <key>CONFIG_HAVE_MOVE_PMD</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_HAVE_MOVE_PUD</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_KFENCE</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_USERFAULTFD</key> - <value type="bool">y</value> - </config> </group> <!-- x86 base requirements --> @@ -110,10 +82,6 @@ <value type="bool">n</value> </config> <config> - <key>CONFIG_KFENCE</key> - <value type="bool">y</value> - </config> - <config> <key>CONFIG_PAGE_TABLE_ISOLATION</key> <value type="bool">y</value> </config> @@ -122,36 +90,6 @@ <value type="bool">y</value> </config> <config> - <key>CONFIG_HAVE_MOVE_PMD</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_HAVE_MOVE_PUD</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_RANDOMIZE_BASE</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_USERFAULTFD</key> - <value type="bool">y</value> - </config> -</group> - -<!-- x86_64 base requirements --> -<group> - <conditions> - <config> - <key>CONFIG_X86_64</key> - <value type="bool">y</value> - </config> - </conditions> - <!--<config> - <key>CONFIG_CFI_CLANG</key> - <value type="bool">y</value> - </config>--> - <config> <key>CONFIG_BPF_JIT_ALWAYS_ON</key> <value type="bool">y</value> </config> @@ -210,35 +148,3 @@ <value type="bool">y</value> </config> </group> - -<!-- CONFIG_VMAP_STACK requirement --> -<group> - <conditions> - <config> - <key>CONFIG_HAVE_ARCH_VMAP_STACK</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_KASAN_SW_TAGS</key> - <value type="bool">n</value> - </config> - </conditions> - <config> - <key>CONFIG_VMAP_STACK</key> - <value type="bool">y</value> - </config> -</group> - -<!-- CONFIG_INIT_STACK_ALL_ZERO requirement --> -<group> - <conditions> - <config> - <key>CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO</key> - <value type="bool">y</value> - </config> - </conditions> - <config> - <key>CONFIG_INIT_STACK_ALL_ZERO</key> - <value type="bool">y</value> - </config> -</group>
\ No newline at end of file diff --git a/android-5.15/android-base.config b/android-4.19/android-base.config index 5ce4ef6..0867013 100644 --- a/android-5.15/android-base.config +++ b/android-4.19/android-base.config @@ -13,6 +13,7 @@ # CONFIG_RT_GROUP_SCHED is not set # CONFIG_SYSVIPC is not set # CONFIG_USELIB is not set +# CONFIG_VHOST is not set CONFIG_ADVISE_SYSCALLS=y CONFIG_AIO=y CONFIG_ANDROID=y @@ -20,17 +21,14 @@ 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 @@ -53,7 +51,6 @@ 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 @@ -62,27 +59,26 @@ 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_INET6_XFRM_MODE_TRANSPORT=y +CONFIG_INET6_XFRM_MODE_TUNNEL=y CONFIG_INET=y CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_ESP=y CONFIG_INET_UDP_DIAG=y +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_INOTIFY_USER=y CONFIG_INPUT=y CONFIG_INPUT_EVDEV=y @@ -120,7 +116,6 @@ 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 @@ -169,12 +164,9 @@ 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 @@ -184,7 +176,6 @@ 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 @@ -220,7 +211,6 @@ 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 diff --git a/android-4.19/android-recommended-arm.config b/android-4.19/android-recommended-arm.config new file mode 100644 index 0000000..1ff0342 --- /dev/null +++ b/android-4.19/android-recommended-arm.config @@ -0,0 +1,6 @@ +# 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-4.19/android-recommended-arm64.config b/android-4.19/android-recommended-arm64.config new file mode 100644 index 0000000..16ec836 --- /dev/null +++ b/android-4.19/android-recommended-arm64.config @@ -0,0 +1,7 @@ +# 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-4.19/android-recommended-x86.config b/android-4.19/android-recommended-x86.config new file mode 100644 index 0000000..0388b3f --- /dev/null +++ b/android-4.19/android-recommended-x86.config @@ -0,0 +1,5 @@ +# 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-4.19/android-recommended.config b/android-4.19/android-recommended.config new file mode 100644 index 0000000..e47684c --- /dev/null +++ b/android-4.19/android-recommended.config @@ -0,0 +1,130 @@ +# 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_SCHED_TUNE=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_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-4.19/non_debuggable.config b/android-4.19/non_debuggable.config new file mode 100644 index 0000000..71b51bf --- /dev/null +++ b/android-4.19/non_debuggable.config @@ -0,0 +1,2 @@ +# KEEP ALPHABETICALLY SORTED +# CONFIG_DEBUG_FS is not set diff --git a/android-5.10/Android.bp b/android-5.10/Android.bp index f3b5f2f..27f1ad2 100644 --- a/android-5.10/Android.bp +++ b/android-5.10/Android.bp @@ -14,13 +14,21 @@ package { // See: http://go/android-license-faq - default_applicable_licenses: ["Android-Apache-2.0"], + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "kernel_configs_license" + // to get the below license kinds: + // legacy_notice + default_applicable_licenses: ["kernel_configs_license"], } kernel_config { name: "kernel_config_current_5.10", srcs: [ "android-base.config", + "non_debuggable.config", + ], + debuggable_srcs: [ + "android-base.config", ], meta: "android-base-conditional.xml", } diff --git a/android-5.10/android-base-conditional.xml b/android-5.10/android-base-conditional.xml index 53ea697..04ac88d 100644 --- a/android-5.10/android-base-conditional.xml +++ b/android-5.10/android-base-conditional.xml @@ -202,35 +202,3 @@ <value type="bool">y</value> </config> </group> - -<!-- CONFIG_VMAP_STACK requirement --> -<group> - <conditions> - <config> - <key>CONFIG_HAVE_ARCH_VMAP_STACK</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_KASAN_SW_TAGS</key> - <value type="bool">n</value> - </config> - </conditions> - <config> - <key>CONFIG_VMAP_STACK</key> - <value type="bool">y</value> - </config> -</group> - -<!-- CONFIG_INIT_STACK_ALL_ZERO requirement --> -<group> - <conditions> - <config> - <key>CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO</key> - <value type="bool">y</value> - </config> - </conditions> - <config> - <key>CONFIG_INIT_STACK_ALL_ZERO</key> - <value type="bool">y</value> - </config> -</group>
\ No newline at end of file diff --git a/android-5.10/android-base.config b/android-5.10/android-base.config index 52bf43d..5de76f0 100644 --- a/android-5.10/android-base.config +++ b/android-5.10/android-base.config @@ -20,17 +20,14 @@ 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 @@ -53,7 +50,6 @@ 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 @@ -62,7 +58,6 @@ 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 @@ -71,7 +66,6 @@ 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 @@ -120,7 +114,6 @@ 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 @@ -169,11 +162,8 @@ 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 @@ -184,7 +174,6 @@ 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.10/android-recommended-arm.config b/android-5.10/android-recommended-arm.config new file mode 100644 index 0000000..1ff0342 --- /dev/null +++ b/android-5.10/android-recommended-arm.config @@ -0,0 +1,6 @@ +# 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 new file mode 100644 index 0000000..16ec836 --- /dev/null +++ b/android-5.10/android-recommended-arm64.config @@ -0,0 +1,7 @@ +# 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 new file mode 100644 index 0000000..0388b3f --- /dev/null +++ b/android-5.10/android-recommended-x86.config @@ -0,0 +1,5 @@ +# 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 new file mode 100644 index 0000000..de28508 --- /dev/null +++ b/android-5.10/android-recommended.config @@ -0,0 +1,131 @@ +# 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.10/non_debuggable.config b/android-5.10/non_debuggable.config new file mode 100644 index 0000000..862fbff --- /dev/null +++ b/android-5.10/non_debuggable.config @@ -0,0 +1 @@ +# KEEP ALPHABETICALLY SORTED diff --git a/android-5.15/Android.bp b/android-5.4/Android.bp index 20bfc0f..94eec91 100644 --- a/android-5.15/Android.bp +++ b/android-5.4/Android.bp @@ -14,13 +14,21 @@ package { // See: http://go/android-license-faq - default_applicable_licenses: ["Android-Apache-2.0"], + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "kernel_configs_license" + // to get the below license kinds: + // legacy_notice + default_applicable_licenses: ["kernel_configs_license"], } kernel_config { - name: "kernel_config_current_5.15", + name: "kernel_config_current_5.4", srcs: [ "android-base.config", + "non_debuggable.config", + ], + debuggable_srcs: [ + "android-base.config", ], meta: "android-base-conditional.xml", } diff --git a/t/android-5.10/android-base-conditional.xml b/android-5.4/android-base-conditional.xml index db24e7f..4cff64c 100644 --- a/t/android-5.10/android-base-conditional.xml +++ b/android-5.4/android-base-conditional.xml @@ -1,4 +1,4 @@ -<kernel minlts="5.10.107" /> +<kernel minlts="5.4.0" /> <!-- KEEP ALPHABETICALLY SORTED --> <!-- ARM base requirements --> @@ -47,10 +47,10 @@ <key>CONFIG_ARMV8_DEPRECATED</key> <value type="bool">y</value> </config> - <!--<config> + <config> <key>CONFIG_CFI_CLANG</key> <value type="bool">y</value> - </config>--> + </config> <config> <key>CONFIG_COMPAT</key> <value type="bool">y</value> @@ -84,10 +84,6 @@ <value type="bool">y</value> </config> <config> - <key>CONFIG_KFENCE</key> - <value type="bool">y</value> - </config> - <config> <key>CONFIG_USERFAULTFD</key> <value type="bool">y</value> </config> @@ -106,10 +102,6 @@ <value type="bool">n</value> </config> <config> - <key>CONFIG_KFENCE</key> - <value type="bool">y</value> - </config> - <config> <key>CONFIG_PAGE_TABLE_ISOLATION</key> <value type="bool">y</value> </config> @@ -139,10 +131,10 @@ <value type="bool">y</value> </config> </conditions> - <!--<config> + <config> <key>CONFIG_CFI_CLANG</key> <value type="bool">y</value> - </config>--> + </config> <config> <key>CONFIG_BPF_JIT_ALWAYS_ON</key> <value type="bool">y</value> @@ -202,35 +194,3 @@ <value type="bool">y</value> </config> </group> - -<!-- CONFIG_VMAP_STACK requirement --> -<group> - <conditions> - <config> - <key>CONFIG_HAVE_ARCH_VMAP_STACK</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_KASAN_SW_TAGS</key> - <value type="bool">n</value> - </config> - </conditions> - <config> - <key>CONFIG_VMAP_STACK</key> - <value type="bool">y</value> - </config> -</group> - -<!-- CONFIG_INIT_STACK_ALL_ZERO requirement --> -<group> - <conditions> - <config> - <key>CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO</key> - <value type="bool">y</value> - </config> - </conditions> - <config> - <key>CONFIG_INIT_STACK_ALL_ZERO</key> - <value type="bool">y</value> - </config> -</group> diff --git a/t/android-5.15/android-base.config b/android-5.4/android-base.config index 5ce4ef6..d6e1f5a 100644 --- a/t/android-5.15/android-base.config +++ b/android-5.4/android-base.config @@ -20,17 +20,14 @@ 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 @@ -53,7 +50,6 @@ 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 @@ -62,16 +58,12 @@ 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 @@ -120,7 +112,6 @@ 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 @@ -169,12 +160,9 @@ 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 @@ -184,7 +172,6 @@ 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.4/android-recommended-arm.config b/android-5.4/android-recommended-arm.config new file mode 100644 index 0000000..1ff0342 --- /dev/null +++ b/android-5.4/android-recommended-arm.config @@ -0,0 +1,6 @@ +# 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.4/android-recommended-arm64.config b/android-5.4/android-recommended-arm64.config new file mode 100644 index 0000000..755dfc3 --- /dev/null +++ b/android-5.4/android-recommended-arm64.config @@ -0,0 +1,8 @@ +# 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_KFENCE=y +CONFIG_RANDOMIZE_BASE=y +CONFIG_RELOCATABLE=y diff --git a/android-5.4/android-recommended-x86.config b/android-5.4/android-recommended-x86.config new file mode 100644 index 0000000..fe497f2 --- /dev/null +++ b/android-5.4/android-recommended-x86.config @@ -0,0 +1,6 @@ +# KEEP ALPHABETICALLY SORTED +CONFIG_CRYPTO_AES_NI_INTEL=y +CONFIG_CRYPTO_SHA256_SSSE3=y +CONFIG_KFENCE=y +CONFIG_RANDOMIZE_BASE=y +CONFIG_RELOCATABLE=y diff --git a/android-5.4/android-recommended.config b/android-5.4/android-recommended.config new file mode 100644 index 0000000..de28508 --- /dev/null +++ b/android-5.4/android-recommended.config @@ -0,0 +1,131 @@ +# 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.4/non_debuggable.config b/android-5.4/non_debuggable.config new file mode 100644 index 0000000..71b51bf --- /dev/null +++ b/android-5.4/non_debuggable.config @@ -0,0 +1,2 @@ +# KEEP ALPHABETICALLY SORTED +# CONFIG_DEBUG_FS is not set diff --git a/build/Android.bp b/build/Android.bp index f2983eb..7c47941 100644 --- a/build/Android.bp +++ b/build/Android.bp @@ -14,7 +14,11 @@ package { // See: http://go/android-license-faq - default_applicable_licenses: ["Android-Apache-2.0"], + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "kernel_configs_license" + // to get the below license kinds: + // legacy_notice + default_applicable_licenses: ["kernel_configs_license"], } bootstrap_go_package { diff --git a/p/android-4.14/Android.bp b/p/android-4.14/Android.bp index e4c4c40..4444de9 100644 --- a/p/android-4.14/Android.bp +++ b/p/android-4.14/Android.bp @@ -14,7 +14,11 @@ package { // See: http://go/android-license-faq - default_applicable_licenses: ["Android-Apache-2.0"], + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "kernel_configs_license" + // to get the below license kinds: + // legacy_notice + default_applicable_licenses: ["kernel_configs_license"], } kernel_config { diff --git a/p/android-4.4/Android.bp b/p/android-4.4/Android.bp index ff08230..b924ec2 100644 --- a/p/android-4.4/Android.bp +++ b/p/android-4.4/Android.bp @@ -14,7 +14,11 @@ package { // See: http://go/android-license-faq - default_applicable_licenses: ["Android-Apache-2.0"], + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "kernel_configs_license" + // to get the below license kinds: + // legacy_notice + default_applicable_licenses: ["kernel_configs_license"], } kernel_config { diff --git a/p/android-4.9/Android.bp b/p/android-4.9/Android.bp index 2a62d58..43afed7 100644 --- a/p/android-4.9/Android.bp +++ b/p/android-4.9/Android.bp @@ -14,7 +14,11 @@ package { // See: http://go/android-license-faq - default_applicable_licenses: ["Android-Apache-2.0"], + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "kernel_configs_license" + // to get the below license kinds: + // legacy_notice + default_applicable_licenses: ["kernel_configs_license"], } kernel_config { diff --git a/q/android-4.14/Android.bp b/q/android-4.14/Android.bp index 215f3bb..2d58711 100644 --- a/q/android-4.14/Android.bp +++ b/q/android-4.14/Android.bp @@ -14,7 +14,11 @@ package { // See: http://go/android-license-faq - default_applicable_licenses: ["Android-Apache-2.0"], + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "kernel_configs_license" + // to get the below license kinds: + // legacy_notice + default_applicable_licenses: ["kernel_configs_license"], } kernel_config { diff --git a/q/android-4.19/Android.bp b/q/android-4.19/Android.bp index 61a1478..6415070 100644 --- a/q/android-4.19/Android.bp +++ b/q/android-4.19/Android.bp @@ -14,7 +14,11 @@ package { // See: http://go/android-license-faq - default_applicable_licenses: ["Android-Apache-2.0"], + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "kernel_configs_license" + // to get the below license kinds: + // legacy_notice + default_applicable_licenses: ["kernel_configs_license"], } kernel_config { diff --git a/q/android-4.9/Android.bp b/q/android-4.9/Android.bp index 1b0cf2a..f9c2154 100644 --- a/q/android-4.9/Android.bp +++ b/q/android-4.9/Android.bp @@ -14,7 +14,11 @@ package { // See: http://go/android-license-faq - default_applicable_licenses: ["Android-Apache-2.0"], + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "kernel_configs_license" + // to get the below license kinds: + // legacy_notice + default_applicable_licenses: ["kernel_configs_license"], } kernel_config { diff --git a/r/android-4.14/Android.bp b/r/android-4.14/Android.bp index f6089bd..a9c0f3a 100644 --- a/r/android-4.14/Android.bp +++ b/r/android-4.14/Android.bp @@ -14,7 +14,11 @@ package { // See: http://go/android-license-faq - default_applicable_licenses: ["Android-Apache-2.0"], + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "kernel_configs_license" + // to get the below license kinds: + // legacy_notice + default_applicable_licenses: ["kernel_configs_license"], } kernel_config { diff --git a/r/android-4.19/Android.bp b/r/android-4.19/Android.bp index 9d00624..38b9688 100644 --- a/r/android-4.19/Android.bp +++ b/r/android-4.19/Android.bp @@ -14,7 +14,11 @@ package { // See: http://go/android-license-faq - default_applicable_licenses: ["Android-Apache-2.0"], + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "kernel_configs_license" + // to get the below license kinds: + // legacy_notice + default_applicable_licenses: ["kernel_configs_license"], } kernel_config { diff --git a/r/android-5.4/Android.bp b/r/android-5.4/Android.bp index 0ea8bbc..28d3fa2 100644 --- a/r/android-5.4/Android.bp +++ b/r/android-5.4/Android.bp @@ -14,7 +14,11 @@ package { // See: http://go/android-license-faq - default_applicable_licenses: ["Android-Apache-2.0"], + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "kernel_configs_license" + // to get the below license kinds: + // legacy_notice + default_applicable_licenses: ["kernel_configs_license"], } kernel_config { diff --git a/s/android-4.19/Android.bp b/s/android-4.19/Android.bp index 9fdc318..3b49890 100644 --- a/s/android-4.19/Android.bp +++ b/s/android-4.19/Android.bp @@ -14,7 +14,11 @@ package { // See: http://go/android-license-faq - default_applicable_licenses: ["Android-Apache-2.0"], + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "kernel_configs_license" + // to get the below license kinds: + // legacy_notice + default_applicable_licenses: ["kernel_configs_license"], } kernel_config { diff --git a/s/android-5.10/Android.bp b/s/android-5.10/Android.bp index 0d2e70d..bd05baa 100644 --- a/s/android-5.10/Android.bp +++ b/s/android-5.10/Android.bp @@ -14,13 +14,21 @@ package { // See: http://go/android-license-faq - default_applicable_licenses: ["Android-Apache-2.0"], + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "kernel_configs_license" + // to get the below license kinds: + // legacy_notice + default_applicable_licenses: ["kernel_configs_license"], } kernel_config { name: "kernel_config_s_5.10", srcs: [ "android-base.config", + "non_debuggable.config", + ], + debuggable_srcs: [ + "android-base.config", ], meta: "android-base-conditional.xml", } diff --git a/s/android-5.10/non_debuggable.config b/s/android-5.10/non_debuggable.config new file mode 100644 index 0000000..862fbff --- /dev/null +++ b/s/android-5.10/non_debuggable.config @@ -0,0 +1 @@ +# KEEP ALPHABETICALLY SORTED diff --git a/s/android-5.4/Android.bp b/s/android-5.4/Android.bp index ed1f2bf..84e32cf 100644 --- a/s/android-5.4/Android.bp +++ b/s/android-5.4/Android.bp @@ -14,7 +14,11 @@ package { // See: http://go/android-license-faq - default_applicable_licenses: ["Android-Apache-2.0"], + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "kernel_configs_license" + // to get the below license kinds: + // legacy_notice + default_applicable_licenses: ["kernel_configs_license"], } kernel_config { diff --git a/t/android-5.10/Android.bp b/t/android-5.10/Android.bp deleted file mode 100644 index 4408b53..0000000 --- a/t/android-5.10/Android.bp +++ /dev/null @@ -1,26 +0,0 @@ -// 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.config b/t/android-5.10/android-base.config deleted file mode 100644 index 52bf43d..0000000 --- a/t/android-5.10/android-base.config +++ /dev/null @@ -1,268 +0,0 @@ -# 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_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 -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_NET_SCH_TBF=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-base-conditional.xml b/t/android-5.15/android-base-conditional.xml deleted file mode 100644 index 3e76ae6..0000000 --- a/t/android-5.15/android-base-conditional.xml +++ /dev/null @@ -1,244 +0,0 @@ -<kernel minlts="5.15.41" /> - -<!-- KEEP ALPHABETICALLY SORTED --> -<!-- ARM base requirements --> -<group> - <conditions> - <config> - <key>CONFIG_ARM</key> - <value type="bool">y</value> - </config> - </conditions> - <config> - <key>CONFIG_AEABI</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_CPU_SW_DOMAIN_PAN</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_DEVKMEM</key> - <value type="bool">n</value> - </config> - <config> - <key>CONFIG_OABI_COMPAT</key> - <value type="bool">n</value> - </config> -</group> - -<!-- ARM64 base requirements --> -<group> - <conditions> - <config> - <key>CONFIG_ARM64</key> - <value type="bool">y</value> - </config> - </conditions> - <config> - <key>CONFIG_ARM64_PAN</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_ARM64_SW_TTBR0_PAN</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_ARMV8_DEPRECATED</key> - <value type="bool">y</value> - </config> - <!--<config> - <key>CONFIG_CFI_CLANG</key> - <value type="bool">y</value> - </config>--> - <config> - <key>CONFIG_COMPAT</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_CP15_BARRIER_EMULATION</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_RANDOMIZE_BASE</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_SETEND_EMULATION</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_SHADOW_CALL_STACK</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_SWP_EMULATION</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_BPF_JIT_ALWAYS_ON</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_HAVE_MOVE_PMD</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_HAVE_MOVE_PUD</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_KFENCE</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_USERFAULTFD</key> - <value type="bool">y</value> - </config> -</group> - -<!-- x86 base requirements --> -<group> - <conditions> - <config> - <key>CONFIG_X86</key> - <value type="bool">y</value> - </config> - </conditions> - <config> - <key>CONFIG_DEVKMEM</key> - <value type="bool">n</value> - </config> - <config> - <key>CONFIG_KFENCE</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_PAGE_TABLE_ISOLATION</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_RETPOLINE</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_HAVE_MOVE_PMD</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_HAVE_MOVE_PUD</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_RANDOMIZE_BASE</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_USERFAULTFD</key> - <value type="bool">y</value> - </config> -</group> - -<!-- x86_64 base requirements --> -<group> - <conditions> - <config> - <key>CONFIG_X86_64</key> - <value type="bool">y</value> - </config> - </conditions> - <!--<config> - <key>CONFIG_CFI_CLANG</key> - <value type="bool">y</value> - </config>--> - <config> - <key>CONFIG_BPF_JIT_ALWAYS_ON</key> - <value type="bool">y</value> - </config> -</group> - -<!-- CONFIG_ACPI || CONFIG_OF --> -<group> - <conditions> - <config> - <key>CONFIG_ACPI</key> - <value type="bool">n</value> - </config> - </conditions> - <config> - <key>CONFIG_OF</key> - <value type="bool">y</value> - </config> -</group> -<group> - <conditions> - <config> - <key>CONFIG_OF</key> - <value type="bool">n</value> - </config> - </conditions> - <config> - <key>CONFIG_ACPI</key> - <value type="bool">y</value> - </config> -</group> - -<!-- EXT4 requirements --> -<group> - <conditions> - <config> - <key>CONFIG_EXT4_FS</key> - <value type="bool">y</value> - </config> - </conditions> - <config> - <key>CONFIG_EXT4_FS_POSIX_ACL</key> - <value type="bool">y</value> - </config> -</group> - -<!-- F2FS requirements --> -<group> - <conditions> - <config> - <key>CONFIG_F2FS_FS</key> - <value type="bool">y</value> - </config> - </conditions> - <config> - <key>CONFIG_F2FS_FS_POSIX_ACL</key> - <value type="bool">y</value> - </config> -</group> - -<!-- CONFIG_VMAP_STACK requirement --> -<group> - <conditions> - <config> - <key>CONFIG_HAVE_ARCH_VMAP_STACK</key> - <value type="bool">y</value> - </config> - <config> - <key>CONFIG_KASAN_SW_TAGS</key> - <value type="bool">n</value> - </config> - </conditions> - <config> - <key>CONFIG_VMAP_STACK</key> - <value type="bool">y</value> - </config> -</group> - -<!-- CONFIG_INIT_STACK_ALL_ZERO requirement --> -<group> - <conditions> - <config> - <key>CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO</key> - <value type="bool">y</value> - </config> - </conditions> - <config> - <key>CONFIG_INIT_STACK_ALL_ZERO</key> - <value type="bool">y</value> - </config> -</group> diff --git a/tools/Android.bp b/tools/Android.bp index 016775a..93aa598 100644 --- a/tools/Android.bp +++ b/tools/Android.bp @@ -1,6 +1,10 @@ package { // See: http://go/android-license-faq - default_applicable_licenses: ["Android-Apache-2.0"], + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "kernel_configs_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["kernel_configs_license"], } python_binary_host { @@ -10,4 +14,13 @@ python_binary_host { srcs: [ "kconfig_xml_fixup.py", ], + + version: { + py2: { + enabled: true, + }, + py3: { + enabled: false, + }, + }, } diff --git a/tools/kconfig_xml_fixup.py b/tools/kconfig_xml_fixup.py index bbdbf41..d833a1a 100755 --- a/tools/kconfig_xml_fixup.py +++ b/tools/kconfig_xml_fixup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # The format of the kernel configs in the framework compatibility matrix # has a couple properties that would make it confusing or cumbersome to @@ -24,40 +24,47 @@ import re import sys def fixup(args): - with open(args.input) as source_f: - # The first line of the conditional xml has the tag containing - # the kernel min LTS version. - line = source_f.readline() - exp_re = re.compile(r"^<kernel minlts=\"(\d+).(\d+).(\d+)\"\s+/>") - exp_match = re.match(exp_re, line) - assert exp_match, "Malformatted kernel conditional config file.\n" + source_f = open(args.input) or die ("Could not open %s" % args.input) + + # The first line of the conditional xml has the tag containing + # the kernel min LTS version. + line = source_f.readline() + exp_re = re.compile(r"^<kernel minlts=\"(\d+).(\d+).(\d+)\"\s+/>") + exp_match = re.match(exp_re, line) + assert exp_match, "Malformatted kernel conditional config file.\n" - major = exp_match.group(1) - minor = exp_match.group(2) - tiny = exp_match.group(3) + major = exp_match.group(1) + minor = exp_match.group(2) + tiny = exp_match.group(3) - if args.output_version: - with open(args.output_version, "w+") as version_f: - version_f.write("{}.{}.{}".format(major, minor, tiny)) + if args.output_version: + version_f = (open(args.output_version, "w+") or + die("Could not open version file")) + version_f.write("{}.{}.{}".format(major, minor, tiny)) + version_f.close() - if args.output_matrix: - with open(args.output_matrix, "w+") as dest_f: - dest_f.write("<compatibility-matrix version=\"1.0\" type=\"framework\">\n") + if args.output_matrix: + dest_f = (open(args.output_matrix, "w+") or + die("Could not open destination file")) + dest_f.write("<compatibility-matrix version=\"1.0\" type=\"framework\">\n") - # First <kernel> must not have <condition> for libvintf backwards compatibility. - dest_f.write("<kernel version=\"{}.{}.{}\" />".format(major, minor, tiny)) + # First <kernel> must not have <condition> for libvintf backwards compatibility. + dest_f.write("<kernel version=\"{}.{}.{}\" />".format(major, minor, tiny)) + + line = source_f.readline() + while line: + line = line.replace("<value type=\"bool\">", + "<value type=\"tristate\">") + line = line.replace("<group>", + "<kernel version=\"{}.{}.{}\">".format(major, minor, tiny)) + line = line.replace("</group>", "</kernel>") + dest_f.write(line) + line = source_f.readline() - line = source_f.readline() - while line: - line = line.replace("<value type=\"bool\">", - "<value type=\"tristate\">") - line = line.replace("<group>", - "<kernel version=\"{}.{}.{}\">".format(major, minor, tiny)) - line = line.replace("</group>", "</kernel>") - dest_f.write(line) - line = source_f.readline() + dest_f.write("</compatibility-matrix>") + dest_f.close() - dest_f.write("</compatibility-matrix>") + source_f.close() if __name__ == '__main__': parser = argparse.ArgumentParser(description=__doc__) |