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.h

diff --git a/daemon.h b/daemon.h
index 8323e56..faf957a 100644
--- a/daemon.h
+++ b/daemon.h
@@ -29,11 +29,11 @@
 #endif  // USE_DBUS
 
 #if USE_BINDER
-#if defined(__BRILLO__) || defined(__CHROMEOS__)
+#if USE_OMAHA
 #include "update_engine/binder_service_brillo.h"
-#else  // !(defined(__BRILLO__) || defined(__CHROMEOS__))
+#else  // !USE_OMAHA
 #include "update_engine/binder_service_android.h"
-#endif  // defined(__BRILLO__) || defined(__CHROMEOS__)
+#endif  // USE_OMAHA
 #endif  // USE_BINDER
 #include "update_engine/common/subprocess.h"
 #include "update_engine/daemon_state_interface.h"
@@ -72,11 +72,11 @@
 #endif  // USE_WEAVE || USE_BINDER
 
 #if USE_BINDER
-#if defined(__BRILLO__) || defined(__CHROMEOS__)
+#if USE_OMAHA
   android::sp<BinderUpdateEngineBrilloService> binder_service_;
-#else  // !(defined(__BRILLO__) || defined(__CHROMEOS__))
+#else  // !USE_OMAHA
   android::sp<BinderUpdateEngineAndroidService> binder_service_;
-#endif  // defined(__BRILLO__) || defined(__CHROMEOS__)
+#endif  // USE_OMAHA
 #endif  // USE_BINDER
 
   // The daemon state with all the required daemon classes for the configured