Snap for 11591048 from 408124713b to 24Q3-release

Change-Id: I357c4f48af172368b517b541922e8520b1190964
This commit is contained in:
Android Build Coastguard Worker 2024-03-18 23:03:09 +00:00
commit e784088c01
2 changed files with 12 additions and 10 deletions

View file

@ -17,16 +17,17 @@
# Restrict the visibility of Android.bp files to improve build analysis time # Restrict the visibility of Android.bp files to improve build analysis time
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) $(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_HUSKY_KERNEL_VERSION ifdef RELEASE_GOOGLE_HUSKY_KERNEL_VERSION
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_HUSKY_KERNEL_VERSION) TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_HUSKY_KERNEL_VERSION)
endif endif
ifdef RELEASE_GOOGLE_HUSKY_KERNEL_DIR ifdef RELEASE_GOOGLE_HUSKY_KERNEL_DIR
TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR) # Keeps flexibility for kasan and ufs builds
TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR)/kernel-headers 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 endif
LOCAL_PATH := device/google/shusky LOCAL_PATH := device/google/shusky

View file

@ -17,16 +17,17 @@
# Restrict the visibility of Android.bp files to improve build analysis time # Restrict the visibility of Android.bp files to improve build analysis time
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) $(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_SHIBA_KERNEL_VERSION ifdef RELEASE_GOOGLE_SHIBA_KERNEL_VERSION
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_SHIBA_KERNEL_VERSION) TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_SHIBA_KERNEL_VERSION)
endif endif
ifdef RELEASE_GOOGLE_SHIBA_KERNEL_DIR ifdef RELEASE_GOOGLE_SHIBA_KERNEL_DIR
TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR) # Keeps flexibility for kasan and ufs builds
TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR)/kernel-headers 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 endif
LOCAL_PATH := device/google/shusky LOCAL_PATH := device/google/shusky