commit 379513f668fcda85c55c897a4eba234c28c08890
author Kelvin Zhang <zhangkelvin@google.com> Wed Apr 19 17:17:17 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 19 17:17:17 2023 +0000
tree a8896bf1736eb98e3be822a5065b2114cb27c622
parent 0b730f2e7c9185e6529e02822e81d905066c15ad

Switch most targets to android14-6.1

This reverts commit 0b730f2e7c9185e6529e02822e81d905066c15ad.

Reason for revert: b/264456132

Change-Id: Iffed4272ddc45549f2058106cb3d174fbca832a9

shared/BoardConfig.mk

diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk
index 750010b..26f7bed 100644
--- a/shared/BoardConfig.mk
+++ b/shared/BoardConfig.mk
@@ -18,7 +18,7 @@
 # Common BoardConfig for all supported architectures.
 #
 
-TARGET_KERNEL_USE ?= 5.15
+TARGET_KERNEL_USE ?= 6.1
 TARGET_KERNEL_ARCH ?= $(TARGET_ARCH)
 SYSTEM_DLKM_SRC ?= kernel/prebuilts/$(TARGET_KERNEL_USE)/$(TARGET_KERNEL_ARCH)
 TARGET_KERNEL_PATH ?= $(SYSTEM_DLKM_SRC)/kernel-$(TARGET_KERNEL_USE)

shared/minidroid/BoardConfig.mk

diff --git a/shared/minidroid/BoardConfig.mk b/shared/minidroid/BoardConfig.mk
index 2ca1595..68fcff6 100644
--- a/shared/minidroid/BoardConfig.mk
+++ b/shared/minidroid/BoardConfig.mk
@@ -16,7 +16,7 @@
 
 # FIXME: Split up and merge back in with shared/BoardConfig.mk
 
-TARGET_KERNEL_USE ?= 5.15
+TARGET_KERNEL_USE ?= 6.1
 TARGET_KERNEL_ARCH ?= $(TARGET_ARCH)
 TARGET_KERNEL_PATH ?= kernel/prebuilts/$(TARGET_KERNEL_USE)/$(TARGET_KERNEL_ARCH)/kernel-$(TARGET_KERNEL_USE)
 KERNEL_MODULES_PATH ?= \