update_engine: update for libchrome uprev
1. log_file will be renamed to log_file_path to take string paramemters.
log_file will take FILE* instead.
2. message_loop_current.h is no longer implicitly included, due to
deprecation of base::MessageLoop.
BUG=chromium:1094927
TEST=unittest
Change-Id: Ie18b09343200815f8e64631dd30f7a49c4a7b569
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/system/update_engine/+/2262083
Reviewed-by: Jae Hoon Kim <kimjae@chromium.org>
Tested-by: Qijiang Fan <fqj@google.com>
Commit-Queue: Qijiang Fan <fqj@google.com>
diff --git a/client_library/client_dbus.cc b/client_library/client_dbus.cc
index 8e9a7fd..caf7bef 100644
--- a/client_library/client_dbus.cc
+++ b/client_library/client_dbus.cc
@@ -17,6 +17,7 @@
#include "update_engine/client_library/client_dbus.h"
#include <base/message_loop/message_loop.h>
+#include <base/message_loop/message_loop_current.h>
#include <memory>
diff --git a/main.cc b/main.cc
index b435467..1d161e3 100644
--- a/main.cc
+++ b/main.cc
@@ -144,7 +144,11 @@
if (log_to_file) {
log_file = SetupLogFile(kSystemLogsRoot);
log_settings.delete_old = logging::APPEND_TO_OLD_LOG_FILE;
+#if BASE_VER < 780000
log_settings.log_file = log_file.c_str();
+#else
+ log_settings.log_file_path = log_file.c_str();
+#endif
}
logging::InitLogging(log_settings);
diff --git a/payload_generator/generate_delta_main.cc b/payload_generator/generate_delta_main.cc
index 69ac8bb..fe0a10b 100644
--- a/payload_generator/generate_delta_main.cc
+++ b/payload_generator/generate_delta_main.cc
@@ -450,7 +450,11 @@
Terminator::Init();
logging::LoggingSettings log_settings;
+#if BASE_VER < 780000
log_settings.log_file = "delta_generator.log";
+#else
+ log_settings.log_file_path = "delta_generator.log";
+#endif
log_settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
log_settings.lock_log = logging::LOCK_LOG_FILE;
log_settings.delete_old = logging::APPEND_TO_OLD_LOG_FILE;