[automerger skipped] DO NOT MERGE am: 1dcb951d11 -s ours
am: 99aec6aaae -s ours
Change-Id: I4d213e664b44abb6857d1ff5804a0be50d4ee730
diff --git a/Android.mk b/Android.mk
index 7857a83..7f22f75 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,6 +1,11 @@
+# Preset TARGET_USES_HARDWARE_QCOM_BOOTCTRL for existing platforms.
+ifneq ($(filter msm8996 msm8998 sdm845 sdm710,$(TARGET_BOARD_PLATFORM)),)
+TARGET_USES_HARDWARE_QCOM_BOOTCTRL := true
+endif
+
+ifeq ($(strip $(TARGET_USES_HARDWARE_QCOM_BOOTCTRL)),true)
# TODO: Find a better way to separate build configs for ADP vs non-ADP devices
ifneq ($(BOARD_IS_AUTOMOTIVE),true)
-ifneq ($(filter msm8996 msm8998 sdm845 sdm710,$(TARGET_BOARD_PLATFORM)),)
LOCAL_PATH := $(call my-dir)
# HAL Shared library for the target. Used by libhardware.
