[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: a2f15dbbe4  -s ours am: 17d5a65498  -s ours
am: 1eda65621f  -s ours

Change-Id: I10ff996671bc6345e8bcc75b6a6e2b1b341e6fe9
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..13d6821
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,34 @@
+soong_namespace {
+}
+
+filegroup {
+    name: "bootctrl_hal_src",
+    srcs: [
+        "boot_control.cpp",
+    ],
+}
+
+cc_defaults {
+    name: "bootctrl_hal_defaults",
+    proprietary: true,
+    recovery_available: true,
+    header_libs: [
+        "libhardware_headers",
+        "libsystem_headers",
+    ],
+    shared_libs: [
+        "libcutils",
+        "liblog",
+        "libz",
+    ],
+    owner: "qti",
+    relative_install_path: "hw",
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+    srcs: [
+        ":bootctrl_hal_src",
+    ],
+
+}
diff --git a/Android.mk b/Android.mk
index 7f22f75..c5a9b16 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,5 @@
 # Preset TARGET_USES_HARDWARE_QCOM_BOOTCTRL for existing platforms.
-ifneq ($(filter msm8996 msm8998 sdm845 sdm710,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter msm8996 msm8998 sdm710,$(TARGET_BOARD_PLATFORM)),)
 TARGET_USES_HARDWARE_QCOM_BOOTCTRL := true
 endif