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
diff --git a/Android.mk b/Android.mk
index ca8087c..a44e908 100644
--- a/Android.mk
+++ b/Android.mk
@@ -27,6 +27,7 @@
# the system layer.
local_use_libcros := $(if $(BRILLO_USE_LIBCROS),$(BRILLO_USE_LIBCROS),0)
local_use_mtd := $(if $(BRILLO_USE_MTD),$(BRILLO_USE_MTD),0)
+local_use_omaha := $(if $(BRILLO_USE_OMAHA),$(BRILLO_USE_OMAHA),0)
local_use_power_management := \
$(if $(BRILLO_USE_POWER_MANAGEMENT),$(BRILLO_USE_POWER_MANAGEMENT),0)
local_use_weave := $(if $(BRILLO_USE_WEAVE),$(BRILLO_USE_WEAVE),0)
@@ -37,6 +38,7 @@
-DUSE_HWID_OVERRIDE=$(local_use_hwid_override) \
-DUSE_LIBCROS=$(local_use_libcros) \
-DUSE_MTD=$(local_use_mtd) \
+ -DUSE_OMAHA=$(local_use_omaha) \
-DUSE_POWER_MANAGEMENT=$(local_use_power_management) \
-DUSE_WEAVE=$(local_use_weave) \
-D_FILE_OFFSET_BITS=64 \
@@ -230,7 +232,7 @@
LOCAL_SRC_FILES := $(ue_libpayload_consumer_src_files)
include $(BUILD_STATIC_LIBRARY)
-ifdef BRILLO
+ifeq ($(local_use_omaha),1)
# libupdate_engine (type: static_library)
# ========================================================
@@ -356,7 +358,7 @@
endif # local_use_libcros == 1
include $(BUILD_STATIC_LIBRARY)
-else # !defined(BRILLO)
+else # local_use_omaha == 1
ifneq ($(local_use_binder),1)
$(error USE_BINDER is disabled but is required in non-Brillo devices.)
@@ -411,7 +413,7 @@
update_status_utils.cc
include $(BUILD_STATIC_LIBRARY)
-endif # !defined(BRILLO)
+endif # local_use_omaha == 1
# update_engine (type: executable)
# ========================================================
@@ -437,7 +439,7 @@
LOCAL_SRC_FILES := \
main.cc
-ifdef BRILLO
+ifeq ($(local_use_omaha),1)
LOCAL_C_INCLUDES += \
$(ue_libupdate_engine_exported_c_includes)
LOCAL_STATIC_LIBRARIES := \
@@ -445,13 +447,13 @@
$(ue_libupdate_engine_exported_static_libraries:-host=)
LOCAL_SHARED_LIBRARIES += \
$(ue_libupdate_engine_exported_shared_libraries:-host=)
-else # !defined(BRILLO)
+else # local_use_omaha == 1
LOCAL_STATIC_LIBRARIES := \
libupdate_engine_android \
$(ue_libupdate_engine_android_exported_static_libraries:-host=)
LOCAL_SHARED_LIBRARIES += \
$(ue_libupdate_engine_android_exported_shared_libraries:-host=)
-endif # !defined(BRILLO)
+endif # local_use_omaha == 1
LOCAL_INIT_RC := update_engine.rc
include $(BUILD_EXECUTABLE)
@@ -520,14 +522,14 @@
LOCAL_LDFLAGS := $(ue_common_ldflags)
LOCAL_C_INCLUDES := $(ue_common_c_includes)
LOCAL_SHARED_LIBRARIES := $(ue_common_shared_libraries)
-ifdef BRILLO
+ifeq ($(local_use_omaha),1)
LOCAL_SHARED_LIBRARIES += \
libupdate_engine_client
LOCAL_SRC_FILES := \
update_engine_client.cc \
common/error_code_utils.cc \
omaha_utils.cc
-else # !defined(BRILLO)
+else # local_use_omaha == 1
#TODO(deymo): Remove external/cros/system_api/dbus once the strings are moved
# out of the DBus interface.
LOCAL_C_INCLUDES += \
@@ -544,7 +546,7 @@
common/error_code_utils.cc \
update_engine_client_android.cc \
update_status_utils.cc
-endif # !defined(BRILLO)
+endif # local_use_omaha == 1
include $(BUILD_EXECUTABLE)
# libpayload_generator (type: static_library)
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_)) {
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
diff --git a/update_engine.gyp b/update_engine.gyp
index 2f27dd4..7a3be60 100644
--- a/update_engine.gyp
+++ b/update_engine.gyp
@@ -55,6 +55,7 @@
'USE_HWID_OVERRIDE=<(USE_hwid_override)',
'USE_LIBCROS=<(USE_libcros)',
'USE_MTD=<(USE_mtd)',
+ 'USE_OMAHA=1',
'USE_POWER_MANAGEMENT=<(USE_power_management)',
'USE_WEAVE=<(USE_buffet)',
],
