Snap for 11722130 from b997e9090c to 24Q3-release

Change-Id: I1d5a9ccd0462314d346dba104af13525a8e9e74e
This commit is contained in:
Android Build Coastguard Worker 2024-04-16 23:02:36 +00:00
commit 4d0167aa4b

View file

@ -14,18 +14,10 @@
# limitations under the License. # limitations under the License.
# #
ifdef RELEASE_GOOGLE_LYNX_KERNEL_VERSION TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_LYNX_VERSION)
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_LYNX_KERNEL_VERSION)
endif
ifdef RELEASE_GOOGLE_LYNX_KERNEL_DIR
# Keeps flexibility for kasan and ufs builds # Keeps flexibility for kasan and ufs builds
TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_LYNX_KERNEL_DIR) TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_LYNX_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_LYNX_KERNEL_DIR)/kernel-headers TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_LYNX_DIR)/kernel-headers
else
TARGET_KERNEL_DIR ?= device/google/lynx-kernel
TARGET_BOARD_KERNEL_HEADERS ?= device/google/lynx-kernel/kernel-headers
endif
$(call inherit-product-if-exists, vendor/google_devices/lynx/prebuilts/device-vendor-lynx.mk) $(call inherit-product-if-exists, vendor/google_devices/lynx/prebuilts/device-vendor-lynx.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk)