diff --git a/device.mk b/device.mk
index 71137e66..dae91c16 100644
--- a/device.mk
+++ b/device.mk
@@ -37,7 +37,7 @@ include device/google/gs-common/sota_app/factoryota.mk
 include device/google/gs-common/misc_writer/misc_writer.mk
 include device/google/gs-common/bootctrl/bootctrl_aidl.mk
 include device/google/gs-common/betterbug/betterbug.mk
-ifneq ($(filter cheetah felix panther, $(TARGET_PRODUCT)),)
+ifneq ($(filter %_cheetah %_felix %_panther, $(TARGET_PRODUCT)),)
   include device/google/gs-common/bcmbt/dump/dumplog.mk
 endif
 include device/google/gs-common/fingerprint/fingerprint.mk