sdm845: fix makefile guard and alphabetize
Change-Id: Ifb0ba72d92b535d712b522f0db345cc4e9cdb35d
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
diff --git a/Android.mk b/Android.mk
index 32fa53c..c735535 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,7 +20,7 @@
# to only building on ARM if they include assembly. Individual makefiles
# are responsible for having their own logic, for fine-grained control.
-ifneq ($(filter enchilada beryllium sdm845, $(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter beryllium enchilada sdm845, $(TARGET_DEVICE)),)
LOCAL_PATH := $(call my-dir)
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index 052562c..5c9066c 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -1,4 +1,4 @@
-ifneq ($(filter enchilada beryllium sdm845, $(TARGET_DEVICE)),)
+ifneq ($(filter beryllium enchilada sdm845, $(TARGET_DEVICE)),)
IMAGE_GZ := device/generic/sdm845/prebuilt-kernel/android-$(TARGET_KERNEL_USE)/Image.gz
DTB := $(wildcard device/generic/sdm845/prebuilt-kernel/android-$(TARGET_KERNEL_USE)/*.dtb)