Snap for 11591048 from 40affb80c7
to 24Q3-release
Change-Id: I9c35e8966bb8e5bbf2593675be3ae4b107946f02
This commit is contained in:
commit
4b1625bc54
2 changed files with 12 additions and 10 deletions
|
@ -17,16 +17,17 @@
|
|||
# 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/raviole-kernel
|
||||
TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
|
||||
|
||||
ifdef RELEASE_GOOGLE_ORIOLE_KERNEL_VERSION
|
||||
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_ORIOLE_KERNEL_VERSION)
|
||||
endif
|
||||
|
||||
ifdef RELEASE_GOOGLE_ORIOLE_KERNEL_DIR
|
||||
TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR)
|
||||
TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR)/kernel-headers
|
||||
# Keeps flexibility for kasan and ufs builds
|
||||
TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR)
|
||||
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR)/kernel-headers
|
||||
else
|
||||
TARGET_KERNEL_DIR ?= device/google/raviole-kernel
|
||||
TARGET_BOARD_KERNEL_HEADERS ?= device/google/raviole-kernel/kernel-headers
|
||||
endif
|
||||
|
||||
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-oriole.mk)
|
||||
|
|
|
@ -17,16 +17,17 @@
|
|||
# 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/raviole-kernel
|
||||
TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
|
||||
|
||||
ifdef RELEASE_GOOGLE_RAVEN_KERNEL_VERSION
|
||||
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_RAVEN_KERNEL_VERSION)
|
||||
endif
|
||||
|
||||
ifdef RELEASE_GOOGLE_RAVEN_KERNEL_DIR
|
||||
TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)
|
||||
TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)/kernel-headers
|
||||
# Keeps flexibility for kasan and ufs builds
|
||||
TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)
|
||||
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)/kernel-headers
|
||||
else
|
||||
TARGET_KERNEL_DIR ?= device/google/raviole-kernel
|
||||
TARGET_BOARD_KERNEL_HEADERS ?= device/google/raviole-kernel/kernel-headers
|
||||
endif
|
||||
|
||||
$(call inherit-product, device/google/raviole/uwb/uwb_calibration_country.mk)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue