gpt-utils: Make BSG/SG configurable

Change-Id: Ibbadee63bddcf03a259649aec9cb0dab6c206833
LineageOS · Feb 16, 2025 · 459dcae · 459dcae
1 parent 9a11172
commit 459dcae
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/bootctrl/Android.bp b/bootctrl/Android.bp
@@ -7,23 +7,23 @@ cc_library_shared {
     name: "[email protected]",
     stem: "[email protected]",
     defaults: ["[email protected]_defaults"],
-    static_libs: ["libgptutils-sg.sony"],
+    static_libs: ["libgptutils.sony"],
 }
 
 cc_library_shared {
     name: "[email protected]",
     stem: "[email protected]",
     defaults: ["[email protected]_defaults"],
-    static_libs: ["libgptutils-bsg.sony"],
+    static_libs: ["libgptutils.sony"],
 }
 
 cc_binary {
     name: "android.hardware.boot-service.qti",
     defaults: ["android.hardware.boot-service.qti_defaults"],
-    static_libs: ["libgptutils-bsg.sony"],
+    static_libs: ["libgptutils.sony"],
 }
 cc_binary {
     name: "android.hardware.boot-service.qti.recovery",
     defaults: ["android.hardware.boot-service.qti.recovery_defaults"],
-    static_libs: ["libgptutils-bsg.sony"],
+    static_libs: ["libgptutils.sony"],
 }
diff --git a/gpt-utils/Android.bp b/gpt-utils/Android.bp
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-cc_defaults {
+cc_library {
     name: "libgptutils.sony",
     export_include_dirs: ["."],
     header_libs: ["generated_kernel_headers"],
@@ -13,20 +13,13 @@ cc_defaults {
         "liblog",
         "libz",
     ],
+    cflags: select(soong_config_variable("QTI_GPT_UTILS", "USE_BSG_FRAMEWORK"), {
+        "false": [],
+        default: ["-D_BSG_FRAMEWORK_KERNEL_HEADERS"],
+    }),
     srcs: [
         "gpt-utils.cpp",
         "recovery-ufs-bsg.cpp",
     ],
     vendor: true,
 }
-
-cc_library {
-    name: "libgptutils-sg.sony",
-    defaults: ["libgptutils.sony"],
-}
-
-cc_library {
-    name: "libgptutils-bsg.sony",
-    defaults: ["libgptutils.sony"],
-    cflags: ["-D_BSG_FRAMEWORK_KERNEL_HEADERS"],
-}