Switch kernel directory to control by build flag
Bug: 309749142 Change-Id: If82fdbbd87cccba0763479e075289efd739e7e34
This commit is contained in:
parent
1b6fd6befa
commit
38562b32f8
3 changed files with 9 additions and 33 deletions
|
@ -17,18 +17,10 @@
|
|||
# Restrict the visibility of Android.bp files to improve build analysis time
|
||||
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
|
||||
|
||||
ifdef RELEASE_GOOGLE_HUSKY_KERNEL_VERSION
|
||||
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_HUSKY_KERNEL_VERSION)
|
||||
endif
|
||||
|
||||
ifdef RELEASE_GOOGLE_HUSKY_KERNEL_DIR
|
||||
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_HUSKY_VERSION)
|
||||
# Keeps flexibility for kasan and ufs builds
|
||||
TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR)
|
||||
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR)/kernel-headers
|
||||
else
|
||||
TARGET_KERNEL_DIR ?= device/google/shusky-kernel
|
||||
TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers
|
||||
endif
|
||||
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_HUSKY_DIR)
|
||||
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_HUSKY_DIR)/kernel-headers
|
||||
|
||||
LOCAL_PATH := device/google/shusky
|
||||
|
||||
|
|
|
@ -17,17 +17,9 @@
|
|||
# Restrict the visibility of Android.bp files to improve build analysis time
|
||||
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
|
||||
|
||||
TARGET_KERNEL_DIR ?= device/google/shusky-kernel
|
||||
TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers
|
||||
|
||||
ifdef RELEASE_GOOGLE_RIPCURRENT_KERNEL_VERSION
|
||||
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_VERSION)
|
||||
endif
|
||||
|
||||
ifdef RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR
|
||||
TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR)
|
||||
TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR)/kernel-headers
|
||||
endif
|
||||
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_RIPCURRENT_VERSION)
|
||||
TARGET_KERNEL_DIR := $(RELEASE_KERNEL_RIPCURRENT_DIR)
|
||||
TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_KERNEL_RIPCURRENT_DIR)/kernel-headers
|
||||
|
||||
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||
USE_UWBFIELDTESTQM := true
|
||||
|
|
|
@ -17,18 +17,10 @@
|
|||
# Restrict the visibility of Android.bp files to improve build analysis time
|
||||
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
|
||||
|
||||
ifdef RELEASE_GOOGLE_SHIBA_KERNEL_VERSION
|
||||
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_SHIBA_KERNEL_VERSION)
|
||||
endif
|
||||
|
||||
ifdef RELEASE_GOOGLE_SHIBA_KERNEL_DIR
|
||||
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_SHIBA_VERSION)
|
||||
# Keeps flexibility for kasan and ufs builds
|
||||
TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR)
|
||||
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR)/kernel-headers
|
||||
else
|
||||
TARGET_KERNEL_DIR ?= device/google/shusky-kernel
|
||||
TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers
|
||||
endif
|
||||
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_SHIBA_DIR)
|
||||
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_SHIBA_DIR)/kernel-headers
|
||||
|
||||
LOCAL_PATH := device/google/shusky
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue