Snap for 12644741 from c509a27bcd to 25Q1-release

Change-Id: I41ffb04e782f275239c323a03a5e98b0170212e0
This commit is contained in:
Android Build Coastguard Worker 2024-11-13 00:02:30 +00:00
commit 20928ea5c2
4 changed files with 7 additions and 3 deletions

View file

@ -37,7 +37,7 @@ TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CAIMAN_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CAIMAN_DIR)/kernel-headers
ifneq ($(TARGET_BOOTS_16K),true)
PRODUCT_16K_DEVELOPER_OPTION ?= $(RELEASE_GOOGLE_CAIMAN_16K_DEVELOPER_OPTION)
PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_CAIMAN_16K_DEVELOPER_OPTION)
endif
include device/google/caimito/device-caimito-16k-common.mk

View file

@ -14,6 +14,8 @@
# limitations under the License.
#
ifneq ($(wildcard $(TARGET_KERNEL_DIR)/16kb/),)
ifeq ($(TARGET_BOOTS_16K),true)
# Configures the 16kb kernel directory.
TARGET_KERNEL_DIR := $(TARGET_KERNEL_DIR)/16kb
@ -38,3 +40,5 @@ BOARD_16K_OTA_USE_INCREMENTAL := true
BOARD_16K_OTA_MOVE_VENDOR := true
endif
endif

View file

@ -37,7 +37,7 @@ TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_KOMODO_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_KOMODO_DIR)/kernel-headers
ifneq ($(TARGET_BOOTS_16K),true)
PRODUCT_16K_DEVELOPER_OPTION ?= $(RELEASE_GOOGLE_KOMODO_16K_DEVELOPER_OPTION)
PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_KOMODO_16K_DEVELOPER_OPTION)
endif
include device/google/caimito/device-caimito-16k-common.mk

View file

@ -37,7 +37,7 @@ TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_TOKAY_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_TOKAY_DIR)/kernel-headers
ifneq ($(TARGET_BOOTS_16K),true)
PRODUCT_16K_DEVELOPER_OPTION ?= $(RELEASE_GOOGLE_TOKAY_16K_DEVELOPER_OPTION)
PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_TOKAY_16K_DEVELOPER_OPTION)
endif
include device/google/caimito/device-caimito-16k-common.mk