16kb: Set 16kb kernel for caimito targets

When TARGET_BOOTS_16K is set to true for caimito
targets, the 16kb kernel will be picked.

Bug: 347110197
Test: $ source build/envsetup.sh
      $ lunch tokay_16k-trunk_staging-userdebug
      $ get_build_var TARGET_KERNEL_DIR
      device/google/caimito-kernels/6.1/trunk-12120393/16kb
      $ get_build_var RELEASE_KERNEL_TOKAY_DIR
      device/google/caimito-kernels/6.1/trunk-12120393
      $ get_build_var KERNEL_MODULE_DIR
      device/google/caimito-kernels/6.1/trunk-12120393/16kb
      $ get_build_var TARGET_BOARD_KERNEL_HEADERS
      device/google/caimito-kernels/6.1/trunk-12120393/kernel-headers
Flag: EXEMPT bugfix
Change-Id: I1fc0f3aa778eb2e25d2d07d8cc9f26065aabb4bf
This commit is contained in:
Juan Yescas 2024-07-24 22:22:02 -07:00
parent 2fe0d53e80
commit 87147bd1ab
4 changed files with 29 additions and 0 deletions

View file

@ -27,6 +27,9 @@ $(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOA
ifdef RELEASE_KERNEL_CAIMAN_DIR
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CAIMAN_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CAIMAN_DIR)/kernel-headers
include device/google/caimito/device-caimito-16k-common.mk
else
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers

View file

@ -0,0 +1,20 @@
#
# Copyright (C) 2024 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.
#
ifeq ($(TARGET_BOOTS_16K),true)
# Configures the 16kb kernel directory.
TARGET_KERNEL_DIR := $(TARGET_KERNEL_DIR)/16kb
endif

View file

@ -27,6 +27,9 @@ $(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOA
ifdef RELEASE_KERNEL_KOMODO_DIR
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_KOMODO_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_KOMODO_DIR)/kernel-headers
include device/google/caimito/device-caimito-16k-common.mk
else
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers

View file

@ -27,6 +27,9 @@ $(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOA
ifdef RELEASE_KERNEL_TOKAY_DIR
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_TOKAY_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_TOKAY_DIR)/kernel-headers
include device/google/caimito/device-caimito-16k-common.mk
else
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers