commit ac44d1609e8967242ad3402f9e80a45ecac08954
author Dmitry Shmidt <dimitrysh@google.com> Fri Jan 19 09:21:35 2018 -0800
committer Dmitry Shmidt <dimitrysh@google.com> Fri Jan 19 13:13:36 2018 -0800
tree c98dd060ccbef3c5615f57f708bc50adc6f0bd83
parent 0f52509e31fdeda0824c14304cd0f6f5fd6e4ebe

bt-wifi-firmware: Allow to accept any hikey960 target derivative

Bug: 72216718
Test: Manual

Change-Id: I687b8694345b9b4afe849474f5b6178658182df6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

bt-wifi-firmware-util/Android.mk

diff --git a/bt-wifi-firmware-util/Android.mk b/bt-wifi-firmware-util/Android.mk
index cdfefe4..7e41a35 100644
--- a/bt-wifi-firmware-util/Android.mk
+++ b/bt-wifi-firmware-util/Android.mk
@@ -18,7 +18,7 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := TIInit_11.8.32.bts
-ifeq ($(TARGET_PRODUCT),hikey960)
+ifneq ($(filter hikey960, $(TARGET_DEVICE)),)
 LOCAL_SRC_FILES := TIInit_11.8.32-pcm-960.bts
 else
 LOCAL_SRC_FILES := TIInit_11.8.32.bts
@@ -40,7 +40,7 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := wl18xx-conf.bin
-ifeq ($(TARGET_PRODUCT),hikey960)
+ifneq ($(filter hikey960, $(TARGET_DEVICE)),)
 LOCAL_SRC_FILES := wl18xx-conf-wl1837mod.bin
 else
 LOCAL_SRC_FILES := wl18xx-conf.bin