commit 5460a9cd2ad19a9c6157baed6f130164be06e973
author Petri Gynther <pgynther@google.com> Fri Sep 03 13:34:14 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 03 13:34:14 2021 +0000
tree 13fb0cf27ac71438dc4aa126fcb75ebe598edf88
parent df141c93256eca0aecda094887c920449a15486e
parent 24d9c3647b183e3bf7be9e427c5ae809bb77a104

gs101: clean up kernel variables am: 17f6b03738 am: f276caad32 am: 9ad38e7941

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/15746361

Change-Id: I4578b811d14a6c984a5591089ea2e29cc3f09dc1

BoardConfig-common.mk

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index a3dcda0..0d67432 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -323,8 +323,6 @@
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := \
 	build/make/target/board/mainline_arm64/bluetooth
 
-TARGET_BOARD_KERNEL_HEADERS := $(TARGET_KERNEL_DIR)/kernel-headers
-
 #VNDK
 BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
 BOARD_VNDK_VERSION := current

device.mk

diff --git a/device.mk b/device.mk
index 036fca8..42a8c1f 100644
--- a/device.mk
+++ b/device.mk
@@ -48,11 +48,7 @@
 	vendor/google_nos/host/android \
 	vendor/google_nos/test/system-test-harness
 
-ifeq ($(TARGET_PREBUILT_KERNEL),)
 LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4
-else
-LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
-endif
 
 # OEM Unlock reporting
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \