From 630fd3d763c779011ab6456f0067190424e3fa44 Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Tue, 28 Jun 2022 17:17:52 +0200
Subject: [PATCH] bootctrl: Add android.hardware.boot@1.1-impl-qti back

This will be used for devices that don't support BSG.

Change-Id: I382a4e1116420442091591d4055840fd71cb891c
---
 bootctrl/Android.bp  |  9 ++++++++-
 gpt-utils/Android.bp | 14 ++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

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"],
+}