diff --git a/bootctrl/Android.bp b/bootctrl/Android.bp
index 18e22e6..89549a0 100644
--- a/bootctrl/Android.bp
+++ b/bootctrl/Android.bp
@@ -3,9 +3,16 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+cc_library_shared {
+    name: "android.hardware.boot@1.1-impl-qti",
+    stem: "android.hardware.boot@1.0-impl-1.1-qti",
+    defaults: ["android.hardware.boot@1.1-impl-qti_defaults"],
+    static_libs: ["libgptutils-sg.oplus"],
+}
+
 cc_library_shared {
     name: "android.hardware.boot@1.2-impl-qti",
     stem: "android.hardware.boot@1.0-impl-1.2-qti",
     defaults: ["android.hardware.boot@1.2-impl-qti_defaults"],
-    static_libs: ["libgptutils.oplus"],
+    static_libs: ["libgptutils-bsg.oplus"],
 }
diff --git a/gpt-utils/Android.bp b/gpt-utils/Android.bp
index 5b2ab52..6c3cee9 100644
--- a/gpt-utils/Android.bp
+++ b/gpt-utils/Android.bp
@@ -3,9 +3,8 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-cc_library {
+cc_defaults {
     name: "libgptutils.oplus",
-    cflags: ["-D_BSG_FRAMEWORK_KERNEL_HEADERS"],
     export_include_dirs: ["."],
     header_libs: ["generated_kernel_headers"],
     recovery_available: true,
@@ -20,3 +19,14 @@ cc_library {
     ],
     vendor: true,
 }
+
+cc_library {
+    name: "libgptutils-sg.oplus",
+    defaults: ["libgptutils.oplus"],
+}
+
+cc_library {
+    name: "libgptutils-bsg.oplus",
+    defaults: ["libgptutils.oplus"],
+    cflags: ["-D_BSG_FRAMEWORK_KERNEL_HEADERS"],
+}