commit e9c1d3766224445b9586d25fd2e79c2cc7f61ede
author Kelvin Zhang <zhangkelvin@google.com> Mon Jun 13 15:40:44 2022 -0700
committer Kelvin Zhang <zhangkelvin@google.com> Mon Jun 27 10:23:11 2022 -0700
tree 56c6566f507cfde4bb6752654cc9db7e9b3164ff
parent c675fc0aaa6f9e4d88d040847435f2487ff9a2d3

Switch update_engine over to generic BootControlClient

Test: th
Change-Id: I5097a578d5809aec48c4cbdf2dc0359a28042fb2

aosp/boot_control_android.h

diff --git a/aosp/boot_control_android.h b/aosp/boot_control_android.h
index 9012032..018c00c 100644
--- a/aosp/boot_control_android.h
+++ b/aosp/boot_control_android.h
@@ -21,9 +21,9 @@
 #include <memory>
 #include <string>
 
-#include <android/hardware/boot/1.0/IBootControl.h>
 #include <liblp/builder.h>
 #include <gtest/gtest_prod.h>
+#include <BootControlClient.h>
 
 #include "update_engine/aosp/dynamic_partition_control_android.h"
 #include "update_engine/common/boot_control.h"
@@ -67,7 +67,7 @@
   DynamicPartitionControlInterface* GetDynamicPartitionControl() override;
 
  private:
-  ::android::sp<::android::hardware::boot::V1_0::IBootControl> module_;
+  std::unique_ptr<android::hal::BootControlClient> module_;
   std::unique_ptr<DynamicPartitionControlAndroid> dynamic_control_;
 
   friend class BootControlAndroidTest;