billie: Switch to QTI bootctrl HAL

luk1337 · theimpulson · commit fd377e747ff1 · 2022-09-02T18:20:56.000Z
Change-Id: Ie5079fd4c40cb1f7414f2cba9f98d350f03047d8
diff --git a/Android.bp b/Android.bp
@@ -1,3 +1,3 @@
 soong_namespace {
-    imports: ["hardware/qcom/bootctrl"],
+    imports: ["hardware/qcom-caf/bootctrl"],
 }
diff --git a/bootctrl/Android.bp b/bootctrl/Android.bp
@@ -19,3 +19,10 @@ cc_library {
     defaults: ["bootctrl_hal_defaults"],
     static_libs: ["libgptutils.oneplus_lito"],
 }
+
+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.oneplus_lito"],
+}
diff --git a/device.mk b/device.mk
@@ -174,9 +174,9 @@ PRODUCT_COPY_FILES += \
 
 # Boot control
 PRODUCT_PACKAGES += \
-    android.hardware.boot@1.0-impl:64 \
-    android.hardware.boot@1.0-service \
-    android.hardware.boot@1.0-impl.recovery \
+    android.hardware.boot@1.1-impl-qti \
+    android.hardware.boot@1.1-impl-qti.recovery \
+    android.hardware.boot@1.1-service \
     bootctrl.lito \
     bootctrl.lito.recovery
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`soong_namespace {`
`2`		`- imports: ["hardware/qcom/bootctrl"],`
	`2`	`+ imports: ["hardware/qcom-caf/bootctrl"],`
`3`	`3`	`}`
-Original file line number
+Diff line change
     defaults: ["bootctrl_hal_defaults"],
     static_libs: ["libgptutils.oneplus_lito"],
+}
++
 +cc_library_shared {
 +    name: "[email protected]",
 +    stem: "[email protected]",
 +    defaults: ["[email protected]_defaults"],
 +    static_libs: ["libgptutils.oneplus_lito"],
 +}