Skip to content

Commit 043f6d0

Browse files
committed
dashboard/config: update Android 6.12
Use the latest available revision and disable ANDROID_BINDER_IPC - as of now, it's no longer possible to compile in both C and Rust versions at the same time.
1 parent b399f39 commit 043f6d0

File tree

5 files changed

+62
-181
lines changed

5 files changed

+62
-181
lines changed

dashboard/config/linux/android-6.12-base.config

Lines changed: 28 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Automatically generated by syz-kconf; DO NOT EDIT.
2-
# Kernel: https://android.googlesource.com/kernel/common 0697e85aef2e6a986214cc886be423fee63ae0e2
2+
# Kernel: https://android.googlesource.com/kernel/common 5150a2974c100f8aa5cbfa9a09d804ee4369f61e
33

44
#
55
# Automatically generated file; DO NOT EDIT.
@@ -17,6 +17,8 @@ CONFIG_LLD_VERSION=210108
1717
CONFIG_RUSTC_VERSION=109101
1818
CONFIG_RUST_IS_AVAILABLE=y
1919
CONFIG_RUSTC_LLVM_VERSION=210102
20+
CONFIG_RUSTC_LLVM_MAJOR_VERSION=21
21+
CONFIG_RUSTC_CLANG_LLVM_COMPATIBLE=y
2022
CONFIG_CC_CAN_LINK=y
2123
CONFIG_CC_CAN_LINK_STATIC=y
2224
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@@ -25,6 +27,7 @@ CONFIG_CC_HAS_ASM_INLINE=y
2527
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
2628
CONFIG_CC_HAS_COUNTED_BY=y
2729
CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y
30+
CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES=y
2831
CONFIG_PAHOLE_VERSION=0
2932
CONFIG_CONSTRUCTORS=y
3033
CONFIG_IRQ_WORK=y
@@ -263,6 +266,7 @@ CONFIG_RD_ZSTD=y
263266
CONFIG_BOOT_CONFIG=y
264267
# CONFIG_BOOT_CONFIG_FORCE is not set
265268
# CONFIG_BOOT_CONFIG_EMBED is not set
269+
CONFIG_CMDLINE_LOG_WRAP_IDEAL_LEN=1021
266270
CONFIG_INITRAMFS_PRESERVE_MTIME=y
267271
CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
268272
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -503,7 +507,7 @@ CONFIG_CMDLINE="earlyprintk=serial net.ifnames=0 sysctl.kernel.hung_task_all_cpu
503507
# CONFIG_CMDLINE_OVERRIDE is not set
504508
CONFIG_MODIFY_LDT_SYSCALL=y
505509
# CONFIG_STRICT_SIGALTSTACK_SIZE is not set
506-
# CONFIG_CFI_AUTO_DEFAULT is not set
510+
CONFIG_CFI_AUTO_DEFAULT=y
507511
CONFIG_HAVE_LIVEPATCH=y
508512
# end of Processor type and features
509513

@@ -539,6 +543,9 @@ CONFIG_MITIGATION_SPECTRE_V1=y
539543
CONFIG_MITIGATION_SPECTRE_V2=y
540544
CONFIG_MITIGATION_SRBDS=y
541545
CONFIG_MITIGATION_SSB=y
546+
CONFIG_MITIGATION_ITS=y
547+
CONFIG_MITIGATION_TSA=y
548+
CONFIG_MITIGATION_VMSCAPE=y
542549
CONFIG_ARCH_HAS_ADD_PAGES=y
543550

544551
#
@@ -1008,6 +1015,7 @@ CONFIG_GKI_HIDDEN_UFS_CONFIGS=y
10081015
CONFIG_GKI_HIDDEN_MMC_CONFIGS=y
10091016
CONFIG_GKI_HIDDEN_GPIO_CONFIGS=y
10101017
CONFIG_GKI_HIDDEN_QCOM_CONFIGS=y
1018+
# CONFIG_GKI_HIDDEN_MTK_CONFIGS is not set
10111019
CONFIG_GKI_HIDDEN_MEDIA_CONFIGS=y
10121020
CONFIG_GKI_HIDDEN_VIRTUAL_CONFIGS=y
10131021
CONFIG_GKI_LEGACY_WEXT_ALLCONFIG=y
@@ -1327,7 +1335,7 @@ CONFIG_NF_NAT_REDIRECT=y
13271335
CONFIG_NF_NAT_MASQUERADE=y
13281336
# CONFIG_NF_TABLES is not set
13291337
CONFIG_NETFILTER_XTABLES=y
1330-
# CONFIG_NETFILTER_XTABLES_COMPAT is not set
1338+
CONFIG_NETFILTER_XTABLES_COMPAT=y
13311339

13321340
#
13331341
# Xtables combined modules
@@ -1598,7 +1606,7 @@ CONFIG_NET_EMATCH_TEXT=y
15981606
CONFIG_NET_CLS_ACT=y
15991607
CONFIG_NET_ACT_POLICE=y
16001608
CONFIG_NET_ACT_GACT=y
1601-
# CONFIG_GACT_PROB is not set
1609+
CONFIG_GACT_PROB=y
16021610
CONFIG_NET_ACT_MIRRED=y
16031611
# CONFIG_NET_ACT_SAMPLE is not set
16041612
# CONFIG_NET_ACT_NAT is not set
@@ -2000,18 +2008,20 @@ CONFIG_BLK_DEV=y
20002008
CONFIG_ZRAM=y
20012009
CONFIG_ZRAM_BACKEND_LZ4=y
20022010
# CONFIG_ZRAM_BACKEND_LZ4HC is not set
2003-
# CONFIG_ZRAM_BACKEND_ZSTD is not set
2011+
CONFIG_ZRAM_BACKEND_ZSTD=y
20042012
# CONFIG_ZRAM_BACKEND_DEFLATE is not set
20052013
# CONFIG_ZRAM_BACKEND_842 is not set
20062014
CONFIG_ZRAM_BACKEND_LZO=y
20072015
CONFIG_ZRAM_DEF_COMP_LZORLE=y
20082016
# CONFIG_ZRAM_DEF_COMP_LZO is not set
20092017
# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
2018+
# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
20102019
CONFIG_ZRAM_DEF_COMP="lzo-rle"
2011-
# CONFIG_ZRAM_WRITEBACK is not set
2020+
CONFIG_ZRAM_WRITEBACK=y
20122021
# CONFIG_ZRAM_TRACK_ENTRY_ACTIME is not set
20132022
# CONFIG_ZRAM_MEMORY_TRACKING is not set
2014-
# CONFIG_ZRAM_MULTI_COMP is not set
2023+
CONFIG_ZRAM_MULTI_COMP=y
2024+
CONFIG_ZRAM_ANDROID_IOCTL=y
20152025
CONFIG_BLK_DEV_LOOP=y
20162026
CONFIG_BLK_DEV_LOOP_MIN_COUNT=16
20172027
# CONFIG_BLK_DEV_DRBD is not set
@@ -3685,8 +3695,6 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
36853695
# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
36863696
CONFIG_V4L2_MEM2MEM_DEV=y
36873697
# CONFIG_V4L2_FLASH_LED_CLASS is not set
3688-
CONFIG_V4L2_FWNODE=y
3689-
CONFIG_V4L2_ASYNC=y
36903698
# end of Video4Linux options
36913699

36923700
#
@@ -3887,81 +3895,6 @@ CONFIG_VIDEOBUF2_DMA_SG=y
38873895
# Media ancillary drivers
38883896
#
38893897
CONFIG_VIDEO_IR_I2C=y
3890-
CONFIG_VIDEO_CAMERA_SENSOR=y
3891-
# CONFIG_VIDEO_ALVIUM_CSI2 is not set
3892-
# CONFIG_VIDEO_AR0521 is not set
3893-
# CONFIG_VIDEO_GC0308 is not set
3894-
# CONFIG_VIDEO_GC05A2 is not set
3895-
# CONFIG_VIDEO_GC08A3 is not set
3896-
# CONFIG_VIDEO_GC2145 is not set
3897-
# CONFIG_VIDEO_HI556 is not set
3898-
# CONFIG_VIDEO_HI846 is not set
3899-
# CONFIG_VIDEO_HI847 is not set
3900-
# CONFIG_VIDEO_IMX208 is not set
3901-
# CONFIG_VIDEO_IMX214 is not set
3902-
# CONFIG_VIDEO_IMX219 is not set
3903-
# CONFIG_VIDEO_IMX258 is not set
3904-
# CONFIG_VIDEO_IMX274 is not set
3905-
# CONFIG_VIDEO_IMX283 is not set
3906-
# CONFIG_VIDEO_IMX290 is not set
3907-
# CONFIG_VIDEO_IMX296 is not set
3908-
# CONFIG_VIDEO_IMX319 is not set
3909-
# CONFIG_VIDEO_IMX334 is not set
3910-
# CONFIG_VIDEO_IMX335 is not set
3911-
# CONFIG_VIDEO_IMX355 is not set
3912-
# CONFIG_VIDEO_IMX412 is not set
3913-
# CONFIG_VIDEO_IMX415 is not set
3914-
# CONFIG_VIDEO_MT9M001 is not set
3915-
# CONFIG_VIDEO_MT9M111 is not set
3916-
# CONFIG_VIDEO_MT9M114 is not set
3917-
# CONFIG_VIDEO_MT9P031 is not set
3918-
# CONFIG_VIDEO_MT9T112 is not set
3919-
# CONFIG_VIDEO_MT9V011 is not set
3920-
# CONFIG_VIDEO_MT9V032 is not set
3921-
# CONFIG_VIDEO_MT9V111 is not set
3922-
# CONFIG_VIDEO_OG01A1B is not set
3923-
# CONFIG_VIDEO_OV01A10 is not set
3924-
# CONFIG_VIDEO_OV02A10 is not set
3925-
# CONFIG_VIDEO_OV08D10 is not set
3926-
# CONFIG_VIDEO_OV08X40 is not set
3927-
# CONFIG_VIDEO_OV13858 is not set
3928-
# CONFIG_VIDEO_OV13B10 is not set
3929-
# CONFIG_VIDEO_OV2640 is not set
3930-
# CONFIG_VIDEO_OV2659 is not set
3931-
# CONFIG_VIDEO_OV2680 is not set
3932-
# CONFIG_VIDEO_OV2685 is not set
3933-
# CONFIG_VIDEO_OV2740 is not set
3934-
# CONFIG_VIDEO_OV4689 is not set
3935-
# CONFIG_VIDEO_OV5640 is not set
3936-
# CONFIG_VIDEO_OV5645 is not set
3937-
# CONFIG_VIDEO_OV5647 is not set
3938-
# CONFIG_VIDEO_OV5648 is not set
3939-
# CONFIG_VIDEO_OV5670 is not set
3940-
# CONFIG_VIDEO_OV5675 is not set
3941-
# CONFIG_VIDEO_OV5693 is not set
3942-
# CONFIG_VIDEO_OV5695 is not set
3943-
# CONFIG_VIDEO_OV64A40 is not set
3944-
# CONFIG_VIDEO_OV6650 is not set
3945-
# CONFIG_VIDEO_OV7251 is not set
3946-
# CONFIG_VIDEO_OV7640 is not set
3947-
# CONFIG_VIDEO_OV7670 is not set
3948-
# CONFIG_VIDEO_OV772X is not set
3949-
# CONFIG_VIDEO_OV7740 is not set
3950-
# CONFIG_VIDEO_OV8856 is not set
3951-
# CONFIG_VIDEO_OV8858 is not set
3952-
# CONFIG_VIDEO_OV8865 is not set
3953-
# CONFIG_VIDEO_OV9282 is not set
3954-
# CONFIG_VIDEO_OV9640 is not set
3955-
# CONFIG_VIDEO_OV9650 is not set
3956-
# CONFIG_VIDEO_OV9734 is not set
3957-
# CONFIG_VIDEO_RDACM20 is not set
3958-
# CONFIG_VIDEO_RDACM21 is not set
3959-
# CONFIG_VIDEO_RJ54N1 is not set
3960-
# CONFIG_VIDEO_S5C73M3 is not set
3961-
# CONFIG_VIDEO_S5K5BAF is not set
3962-
# CONFIG_VIDEO_S5K6A3 is not set
3963-
# CONFIG_VIDEO_VGXY61 is not set
3964-
# CONFIG_VIDEO_ET8EK8 is not set
39653898

39663899
#
39673900
# Camera ISPs
@@ -4972,6 +4905,7 @@ CONFIG_VHOST_MENU=y
49724905
# CONFIG_VHOST_NET is not set
49734906
CONFIG_VHOST_VSOCK=y
49744907
# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
4908+
CONFIG_VHOST_ENABLE_FORK_OWNER_CONTROL=y
49754909

49764910
#
49774911
# Microsoft Hyper-V guest support
@@ -5852,6 +5786,7 @@ CONFIG_IIO_FORMAT_KUNIT_TEST=y
58525786
CONFIG_IRQCHIP=y
58535787
# CONFIG_AL_FIC is not set
58545788
# CONFIG_XILINX_INTC is not set
5789+
# CONFIG_MTK_IRQ is not set
58555790
# end of IRQ chip support
58565791

58575792
# CONFIG_IPACK_BUS is not set
@@ -6216,7 +6151,7 @@ CONFIG_SECURITY=y
62166151
CONFIG_SECURITYFS=y
62176152
CONFIG_SECURITY_NETWORK=y
62186153
# CONFIG_SECURITY_NETWORK_XFRM is not set
6219-
# CONFIG_SECURITY_PATH is not set
6154+
CONFIG_SECURITY_PATH=y
62206155
CONFIG_LSM_MMAP_MIN_ADDR=65536
62216156
CONFIG_HARDENED_USERCOPY=y
62226157
CONFIG_FORTIFY_SOURCE=y
@@ -6236,7 +6171,8 @@ CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
62366171
# CONFIG_SECURITY_YAMA is not set
62376172
# CONFIG_SECURITY_SAFESETID is not set
62386173
# CONFIG_SECURITY_LOCKDOWN_LSM is not set
6239-
# CONFIG_SECURITY_LANDLOCK is not set
6174+
CONFIG_SECURITY_LANDLOCK=y
6175+
# CONFIG_SECURITY_LANDLOCK_KUNIT_TEST is not set
62406176
# CONFIG_SECURITY_IPE is not set
62416177
# CONFIG_INTEGRITY is not set
62426178
CONFIG_DEFAULT_SECURITY_SELINUX=y
@@ -6266,6 +6202,7 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
62666202
# Hardening of kernel data structures
62676203
#
62686204
CONFIG_LIST_HARDENED=y
6205+
# CONFIG_RUST_BITMAP_HARDENED is not set
62696206
CONFIG_BUG_ON_DATA_CORRUPTION=y
62706207
# end of Hardening of kernel data structures
62716208

@@ -6551,14 +6488,17 @@ CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
65516488
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
65526489
CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y
65536490
CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y
6491+
CONFIG_CRYPTO_LIB_CHACHA_INTERNAL=y
65546492
CONFIG_CRYPTO_LIB_CHACHA=y
65556493
CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=y
65566494
CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=y
6495+
CONFIG_CRYPTO_LIB_CURVE25519_INTERNAL=y
65576496
CONFIG_CRYPTO_LIB_CURVE25519=y
65586497
CONFIG_CRYPTO_LIB_DES=y
65596498
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
65606499
CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=y
65616500
CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y
6501+
CONFIG_CRYPTO_LIB_POLY1305_INTERNAL=y
65626502
CONFIG_CRYPTO_LIB_POLY1305=y
65636503
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y
65646504
CONFIG_CRYPTO_LIB_SHA1=y
@@ -6747,7 +6687,6 @@ CONFIG_CC_HAS_UBSAN_ARRAY_BOUNDS=y
67476687
CONFIG_UBSAN_BOUNDS=y
67486688
CONFIG_UBSAN_ARRAY_BOUNDS=y
67496689
CONFIG_UBSAN_SHIFT=y
6750-
# CONFIG_UBSAN_SIGNED_WRAP is not set
67516690
# CONFIG_UBSAN_BOOL is not set
67526691
# CONFIG_UBSAN_ENUM is not set
67536692
# CONFIG_UBSAN_ALIGNMENT is not set
@@ -6847,6 +6786,7 @@ CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
68476786
CONFIG_DETECT_HUNG_TASK=y
68486787
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
68496788
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
6789+
# CONFIG_DETECT_HUNG_TASK_BLOCKER is not set
68506790
CONFIG_WQ_WATCHDOG=y
68516791
# CONFIG_WQ_CPU_INTENSIVE_REPORT is not set
68526792
# CONFIG_TEST_LOCKUP is not set
@@ -7106,6 +7046,7 @@ CONFIG_RUST_DEBUG_ASSERTIONS=y
71067046
CONFIG_RUST_OVERFLOW_CHECKS=y
71077047
# CONFIG_RUST_BUILD_ASSERT_ALLOW is not set
71087048
# CONFIG_RUST_KERNEL_DOCTESTS is not set
7049+
CONFIG_RUST_INLINE_HELPERS=y
71097050
# end of Rust hacking
71107051
# end of Kernel hacking
71117052

0 commit comments

Comments
 (0)