commit 2d68994e6e9f6ebcd804b9036a1c84ccab8b70e2
author LuK1337 <priv.luk@gmail.com> Tue Jan 05 14:15:09 2021 +0100
committer Michael Bestas <mkbestas@lineageos.org> Tue Oct 24 15:32:08 2023 +0300
tree aaaf4c1d41a7031413001f76d47e8b114c62bbf4
parent f0c1efb9f2186d9eab2b4be44f15c18fde564d47

Expose 1.1/1.2 impls via cc_defaults

* Needed for device specific gpt-utils.

Change-Id: I1d9e1b4727728f776594f630f639bd4ca7c4309c

1.1/impl/Android.bp

diff --git a/1.1/impl/Android.bp b/1.1/impl/Android.bp
index 4c26db2..3c8e3a7 100644
--- a/1.1/impl/Android.bp
+++ b/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 @@
         "libutils",
         "android.hardware.boot@1.0",
         "android.hardware.boot@1.1",
-        "libboot_control_qti",
     ],
 }

1.1/libboot_control_qti/Android.bp

diff --git a/1.1/libboot_control_qti/Android.bp b/1.1/libboot_control_qti/Android.bp
index b2c6680..10cef14 100644
--- a/1.1/libboot_control_qti/Android.bp
+++ b/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 @@
         "-Werror",
     ],
     srcs: [
-        "libboot_control_qti.cpp",
+        ":libboot_control_qti_src",
     ],
-    export_include_dirs: ["."],
+    header_libs: ["libboot_control_qti_headers"],
 }

1.2/impl/Android.bp

diff --git a/1.2/impl/Android.bp b/1.2/impl/Android.bp
index db5ed32..918f40f 100644
--- a/1.2/impl/Android.bp
+++ b/1.2/impl/Android.bp
@@ -1,13 +1,18 @@
-cc_library_shared {
-    name: "android.hardware.boot@1.2-impl-qti",
-    stem: "android.hardware.boot@1.0-impl-1.2-qti",
+filegroup {
+    name: "android.hardware.boot@1.2-impl-qti_src",
+    srcs: ["BootControl.cpp"],
+}
+
+cc_defaults {
+    name: "android.hardware.boot@1.2-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.2-impl-qti_src"],
     shared_libs: [
         "liblog",
         "libhidlbase",
@@ -16,6 +21,5 @@
         "android.hardware.boot@1.0",
         "android.hardware.boot@1.1",
         "android.hardware.boot@1.2",
-        "libboot_control_qti",
     ],
 }