From b058000fcf1803d76d1fd2959de602c24c72a94f Mon Sep 17 00:00:00 2001 From: Petri Gynther Date: Thu, 2 Sep 2021 14:26:57 -0700 Subject: [PATCH] raviole: clean up kernel variables 1) make TARGET_KERNEL_DIR assignment conditional 2) add TARGET_BOARD_KERNEL_HEADERS Bug: 198682676 Change-Id: Ica7d816bb421341f3620e156796ef611f437d688 --- device-oriole.mk | 3 ++- device-raven.mk | 3 ++- device-slider.mk | 3 ++- device-whitefin.mk | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index e58ce7e..6508181 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -14,7 +14,8 @@ # limitations under the License. # -TARGET_KERNEL_DIR := device/google/raviole-kernel +TARGET_KERNEL_DIR ?= device/google/raviole-kernel +TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-oriole.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) diff --git a/device-raven.mk b/device-raven.mk index c0190a0..dd8478b 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -14,7 +14,8 @@ # limitations under the License. # -TARGET_KERNEL_DIR := device/google/raviole-kernel +TARGET_KERNEL_DIR ?= device/google/raviole-kernel +TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-raven.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) diff --git a/device-slider.mk b/device-slider.mk index f4e6b57..8acb9ff 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -14,7 +14,8 @@ # limitations under the License. # -TARGET_KERNEL_DIR := device/google/raviole-kernel +TARGET_KERNEL_DIR ?= device/google/raviole-kernel +TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-slider.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) diff --git a/device-whitefin.mk b/device-whitefin.mk index 17e4d45..a61250b 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -14,7 +14,8 @@ # limitations under the License. # -TARGET_KERNEL_DIR := device/google/raviole-kernel +TARGET_KERNEL_DIR ?= device/google/raviole-kernel +TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-whitefin.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)