From e9423387bde718278f9950ad4062c9e596a830b8 Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Tue, 5 Jan 2021 14:15:09 +0100
Subject: [PATCH] Expose 1.1 impl via cc_defaults

* Needed for device specific gpt-utils.

Change-Id: I1d9e1b4727728f776594f630f639bd4ca7c4309c
---
 bootctrl/1.1/impl/Android.bp                | 14 +++++++++-----
 bootctrl/1.1/libboot_control_qti/Android.bp | 20 ++++++++++++++++----
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/bootctrl/1.1/impl/Android.bp b/bootctrl/1.1/impl/Android.bp
index 4c26db2..3c8e3a7 100644
--- a/bootctrl/1.1/impl/Android.bp
+++ b/bootctrl/1.1/impl/Android.bp
@@ -1,13 +1,18 @@
-cc_library_shared {
-    name: "android.hardware.boot@1.1-impl-qti",
-    stem: "android.hardware.boot@1.0-impl-1.1-qti",
+filegroup {
+    name: "android.hardware.boot@1.1-impl-qti_src",
+    srcs: ["BootControl.cpp"],
+}
+
+cc_defaults {
+    name: "android.hardware.boot@1.1-impl-qti_defaults",
     defaults: [
         "hidl_defaults",
+        "libboot_control_qti_defaults",
     ],
     relative_install_path: "hw",
     vendor: true,
     recovery_available: true,
-    srcs: ["BootControl.cpp"],
+    srcs: [":android.hardware.boot@1.1-impl-qti_src"],
     shared_libs: [
         "liblog",
         "libhidlbase",
@@ -15,6 +20,5 @@ cc_library_shared {
         "libutils",
         "android.hardware.boot@1.0",
         "android.hardware.boot@1.1",
-        "libboot_control_qti",
     ],
 }
diff --git a/bootctrl/1.1/libboot_control_qti/Android.bp b/bootctrl/1.1/libboot_control_qti/Android.bp
index b2c6680..10cef14 100644
--- a/bootctrl/1.1/libboot_control_qti/Android.bp
+++ b/bootctrl/1.1/libboot_control_qti/Android.bp
@@ -1,5 +1,17 @@
-cc_library {
-    name: "libboot_control_qti",
+filegroup {
+    name: "libboot_control_qti_src",
+    srcs: ["libboot_control_qti.cpp"],
+}
+
+cc_library_headers {
+    name: "libboot_control_qti_headers",
+    vendor: true,
+    recovery_available: true,
+    export_include_dirs: ["."],
+}
+
+cc_defaults {
+    name: "libboot_control_qti_defaults",
     vendor: true,
     recovery_available: true,
     shared_libs: [
@@ -20,7 +32,7 @@ cc_library {
         "-Werror",
     ],
     srcs: [
-        "libboot_control_qti.cpp",
+        ":libboot_control_qti_src",
     ],
-    export_include_dirs: ["."],
+    header_libs: ["libboot_control_qti_headers"],
 }