Switch default kernel directory and change build flag naming
Bug: 309749142 Change-Id: Ie60ac44eff9b00b8183a2d9f7819e6e6ce52336d
This commit is contained in:
parent
531f24ccf9
commit
f4b6265c47
4 changed files with 12 additions and 26 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_CHEETAH_KERNEL_VERSION
|
||||
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_CHEETAH_KERNEL_VERSION)
|
||||
endif
|
||||
|
||||
ifdef RELEASE_GOOGLE_CHEETAH_KERNEL_DIR
|
||||
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_CHEETAH_VERSION)
|
||||
# Keeps flexibility for kasan and ufs builds
|
||||
TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_CHEETAH_KERNEL_DIR)
|
||||
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_CHEETAH_KERNEL_DIR)/kernel-headers
|
||||
else
|
||||
TARGET_KERNEL_DIR ?= device/google/pantah-kernel
|
||||
TARGET_BOARD_KERNEL_HEADERS ?= device/google/pantah-kernel/kernel-headers
|
||||
endif
|
||||
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR)
|
||||
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CHEETAH_DIR)/kernel-headers
|
||||
|
||||
$(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-cheetah.mk)
|
||||
$(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk)
|
||||
|
|
|
@ -17,8 +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/pantah-kernel
|
||||
TARGET_BOARD_KERNEL_HEADERS := device/google/pantah-kernel/kernel-headers
|
||||
# Keeps flexibility for kasan and ufs builds
|
||||
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR)
|
||||
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CHEETAH_DIR)/kernel-headers
|
||||
|
||||
$(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-cloudripper.mk)
|
||||
$(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk)
|
||||
|
|
|
@ -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_PANTHER_KERNEL_VERSION
|
||||
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_PANTHER_KERNEL_VERSION)
|
||||
endif
|
||||
|
||||
ifdef RELEASE_GOOGLE_PANTHER_KERNEL_DIR
|
||||
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_PANTHER_VERSION)
|
||||
# Keeps flexibility for kasan and ufs builds
|
||||
TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_PANTHER_KERNEL_DIR)
|
||||
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_PANTHER_KERNEL_DIR)/kernel-headers
|
||||
else
|
||||
TARGET_KERNEL_DIR ?= device/google/pantah-kernel
|
||||
TARGET_BOARD_KERNEL_HEADERS ?= device/google/pantah-kernel/kernel-headers
|
||||
endif
|
||||
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_PANTHER_DIR)
|
||||
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_PANTHER_DIR)/kernel-headers
|
||||
|
||||
$(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-panther.mk)
|
||||
$(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk)
|
||||
|
|
|
@ -17,8 +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/pantah-kernel
|
||||
TARGET_BOARD_KERNEL_HEADERS := device/google/pantah-kernel/kernel-headers
|
||||
# Keeps flexibility for kasan and ufs builds
|
||||
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR)
|
||||
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CHEETAH_DIR)/kernel-headers
|
||||
|
||||
$(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-ravenclaw.mk)
|
||||
$(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue