commit 192a86a7e3b5ec90d7860f817100be6a43ca1daa
author Sen Jiang <senj@google.com> Thu May 19 17:21:24 2016 -0700
committer Sen Jiang <senj@google.com> Wed Jun 01 20:11:28 2016 -0700
tree d2c6d6941ea4fd00e2bf8d77dcf7a71e872a3032
parent 94f749aaae272f3b600f4eadb1c1aa1f2bb4e164

Add USE_OMAHA flag.

What we really meant when we use ifdef BRILLO in Android.mk is if use
omaha, so this patch introduce a new use flag for omaha.

Bug: 28752785
Test: mma

Change-Id: I4f3a81d953943dd4cd0907c2aabc10a6cb9d6acc

daemon.cc

diff --git a/daemon.cc b/daemon.cc
index 4c0c52f..6b2d317 100644
--- a/daemon.cc
+++ b/daemon.cc
@@ -25,11 +25,11 @@
 #include <binderwrapper/binder_wrapper.h>
 #endif  // USE_WEAVE || USE_BINDER
 
-#if defined(__BRILLO__) || defined(__CHROMEOS__)
+#if USE_OMAHA
 #include "update_engine/real_system_state.h"
-#else  // !(defined(__BRILLO__) || defined(__CHROMEOS__))
+#else  // !USE_OMAHA
 #include "update_engine/daemon_state_android.h"
-#endif  // defined(__BRILLO__) || defined(__CHROMEOS__)
+#endif  // USE_OMAHA
 
 #if USE_DBUS
 namespace {
@@ -69,7 +69,7 @@
   CHECK(bus->SetUpAsyncOperations());
 #endif  // USE_DBUS
 
-#if defined(__BRILLO__) || defined(__CHROMEOS__)
+#if USE_OMAHA
   // Initialize update engine global state but continue if something fails.
   // TODO(deymo): Move the daemon_state_ initialization to a factory method
   // avoiding the explicit re-usage of the |bus| instance, shared between
@@ -78,21 +78,21 @@
   daemon_state_.reset(real_system_state);
   LOG_IF(ERROR, !real_system_state->Initialize())
       << "Failed to initialize system state.";
-#else  // !(defined(__BRILLO__) || defined(__CHROMEOS__))
+#else  // !USE_OMAHA
   DaemonStateAndroid* daemon_state_android = new DaemonStateAndroid();
   daemon_state_.reset(daemon_state_android);
   LOG_IF(ERROR, !daemon_state_android->Initialize())
       << "Failed to initialize system state.";
-#endif  // defined(__BRILLO__) || defined(__CHROMEOS__)
+#endif  // USE_OMAHA
 
 #if USE_BINDER
   // Create the Binder Service.
-#if defined(__BRILLO__) || defined(__CHROMEOS__)
+#if USE_OMAHA
   binder_service_ = new BinderUpdateEngineBrilloService{real_system_state};
-#else  // !(defined(__BRILLO__) || defined(__CHROMEOS__))
+#else  // !USE_OMAHA
   binder_service_ = new BinderUpdateEngineAndroidService{
       daemon_state_android->service_delegate()};
-#endif  // defined(__BRILLO__) || defined(__CHROMEOS__)
+#endif  // USE_OMAHA
   auto binder_wrapper = android::BinderWrapper::Get();
   if (!binder_wrapper->RegisterService(binder_service_->ServiceName(),
                                        binder_service_)) {