Merge "project: msm8909: Enable haptics for msm8909 with PM660"
diff --git a/AndroidBoot.mk b/AndroidBoot.mk
index a391249..efecfa5 100644
--- a/AndroidBoot.mk
+++ b/AndroidBoot.mk
@@ -37,6 +37,10 @@
ENABLE_BOOTDEVICE_MOUNT := ENABLE_BOOTDEVICE_MOUNT=1
endif
+ifeq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_PM660),true)
+ ENABLE_BG_SUPPORT := ENABLE_BG_SUPPORT=1
+endif
+
ifeq ($(BOOTLOADER_DISABLE_DISPLAY),true)
ENABLE_DISPLAY := ENABLE_DISPLAY=0
else
@@ -108,7 +112,7 @@
# Top level for eMMC variant targets
$(TARGET_EMMC_BOOTLOADER): emmc_appsbootldr_clean | $(EMMC_BOOTLOADER_OUT) $(INSTALLED_KEYSTOREIMAGE_TARGET)
- $(MAKE) -C bootable/bootloader/lk TOOLCHAIN_PREFIX=$(CROSS_COMPILE) BOOTLOADER_OUT=../../../$(EMMC_BOOTLOADER_OUT) $(BOOTLOADER_PLATFORM) EMMC_BOOT=1 $(SIGNED_KERNEL) $(VERIFIED_BOOT) $(ENABLE_DISPLAY) $(ENABLE_BOOTDEVICE_MOUNT) $(DEVICE_STATUS) $(BUILD_VARIANT) $(BOARD_NAME) $(ENABLE_VB_ATTEST) $(OSVERSION_IN_BOOTIMAGE)
+ $(MAKE) -C bootable/bootloader/lk TOOLCHAIN_PREFIX=$(CROSS_COMPILE) BOOTLOADER_OUT=../../../$(EMMC_BOOTLOADER_OUT) $(BOOTLOADER_PLATFORM) EMMC_BOOT=1 $(SIGNED_KERNEL) $(VERIFIED_BOOT) $(ENABLE_DISPLAY) $(ENABLE_BOOTDEVICE_MOUNT) $(DEVICE_STATUS) $(BUILD_VARIANT) $(BOARD_NAME) $(ENABLE_VB_ATTEST) $(OSVERSION_IN_BOOTIMAGE) $(ENABLE_BG_SUPPORT)
# Keep build NAND & eMMC as default for targets still using TARGET_BOOTLOADER
TARGET_BOOTLOADER := $(PRODUCT_OUT)/EMMCBOOT.MBN
diff --git a/project/msm8909.mk b/project/msm8909.mk
index bdf593e..0d820e6 100644
--- a/project/msm8909.mk
+++ b/project/msm8909.mk
@@ -63,7 +63,11 @@
endif
#enable power on vibrator feature
+ifeq ($(ENABLE_BG_SUPPORT),1)
+ENABLE_HAP_VIB_SUPPORT := true
+else
ENABLE_PON_VIB_SUPPORT := true
+endif
ifeq ($(EMMC_BOOT),1)
DEFINES += _EMMC_BOOT=1
@@ -73,6 +77,10 @@
DEFINES += PON_VIB_SUPPORT=1
endif
+ifeq ($(ENABLE_HAP_VIB_SUPPORT),true)
+DEFINES += PON_VIB_SUPPORT=1
+endif
+
ifeq ($(ENABLE_SMD_SUPPORT),1)
DEFINES += SMD_SUPPORT=1
endif