commit 8251dc06e198cb8b2d9331486184b12e9f0e3493
author Kelvin Zhang <zhangkelvin@google.com> Tue Jun 14 09:46:46 2022 -0700
committer Treehugger Robot <treehugger-gerrit@google.com> Wed Jun 15 04:15:28 2022 +0000
tree 728edb5b09f66984eddb696eb25b383d09326f51
parent 3a3c797f6178f00115ba4b4301119a01924066d2

Add AIDL library to update_engine

Also move IApexService.h header to apex_handler_android.h, so that
consumer of ApexHandlerInterface do not need to see IApexService.h.

IApexService.h includes some binder_ndk headers, which includes
syslog.h, which defines LOG_INFO/LOG_WARNING. libchrome also defines
these macros, so including both libchrome and AIDL headers will cause
macro conflict.

Test: th
Bug: 227536004
Change-Id: Ia17d91cc878d106e9b2adeddafe35a71105e1663

aosp/daemon_state_android.cc

diff --git a/aosp/daemon_state_android.cc b/aosp/daemon_state_android.cc
index da49080..dd659ad 100644
--- a/aosp/daemon_state_android.cc
+++ b/aosp/daemon_state_android.cc
@@ -18,7 +18,7 @@
 
 #include <base/logging.h>
 
-#include "update_engine/aosp/apex_handler_android.h"
+#include "update_engine/aosp/apex_handler_interface.h"
 #include "update_engine/aosp/update_attempter_android.h"
 #include "update_engine/common/boot_control.h"
 #include "update_engine/common/boot_control_stub.h"
@@ -65,11 +65,12 @@
   certificate_checker_->Init();
 
   // Initialize the UpdateAttempter before the UpdateManager.
-  update_attempter_.reset(new UpdateAttempterAndroid(this,
-                                                     prefs_.get(),
-                                                     boot_control_.get(),
-                                                     hardware_.get(),
-                                                     CreateApexHandler()));
+  update_attempter_.reset(
+      new UpdateAttempterAndroid(this,
+                                 prefs_.get(),
+                                 boot_control_.get(),
+                                 hardware_.get(),
+                                 ApexHandlerInterface::CreateApexHandler()));
 
   return true;
 }