diff --git a/Android.bp b/Android.bp
index 9515b25..c2ab30c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,2 +1,3 @@
 soong_namespace {
+    imports: ["hardware/qcom/bootctrl"],
 }
diff --git a/bootctrl/Android.bp b/bootctrl/Android.bp
new file mode 100644
index 0000000..f4b3446
--- /dev/null
+++ b/bootctrl/Android.bp
@@ -0,0 +1,21 @@
+//
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+cc_library {
+    name: "bootctrl.sdm845",
+    defaults: ["bootctrl_hal_defaults"],
+    static_libs: ["libgptutils.oneplus_sdm845"],
+}
diff --git a/common.mk b/common.mk
index dba7889..42fea6b 100644
--- a/common.mk
+++ b/common.mk
@@ -56,6 +56,10 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/audio/audio_policy_configuration.xml:system/etc/audio_policy_configuration.xml
 
 # Boot control
+PRODUCT_PACKAGES += \
+    android.hardware.boot@1.0-impl.recovery \
+    bootctrl.sdm845.recovery
+
 PRODUCT_PACKAGES_DEBUG += \
     bootctl
 
@@ -145,12 +149,6 @@ PRODUCT_PACKAGES += \
     update_engine_sideload \
     update_verifier
 
-PRODUCT_STATIC_BOOT_CONTROL_HAL := \
-    bootctrl.sdm845 \
-    libcutils \
-    libgptutils.oneplus_sdm845.recovery \
-    libz \
-
 PRODUCT_PACKAGES_DEBUG += \
     update_engine_client