update_engine: Rename libchromeos into libbrillo
BUG: 24872993
Change-Id: I4cdbec7089552f5c9a0461c09a62e34e055a46bf
diff --git a/Android.mk b/Android.mk
index 56e2514..bb76751 100644
--- a/Android.mk
+++ b/Android.mk
@@ -49,12 +49,12 @@
external/gtest/include \
system
LOCAL_SHARED_LIBRARIES += \
+ libbrillo \
+ libbrillo-dbus \
+ libbrillo-http \
+ libbrillo-stream
libchrome \
libchrome-dbus \
- libchromeos \
- libchromeos-dbus \
- libchromeos-http \
- libchromeos-stream
endef
# update_metadata-protos (type: static_library)
@@ -120,7 +120,7 @@
libshill-client \
libssl \
libexpat \
- libchromeos-policy \
+ libbrillo-policy \
libhardware \
libcutils
LOCAL_SRC_FILES := \
@@ -212,7 +212,7 @@
libshill-client \
libssl \
libexpat \
- libchromeos-policy \
+ libbrillo-policy \
libhardware \
libcutils
LOCAL_SRC_FILES := \
@@ -261,7 +261,7 @@
libshill-client \
libssl \
libexpat \
- libchromeos-policy \
+ libbrillo-policy \
libhardware \
libcutils \
libprotobuf-cpp-lite-rtti \
@@ -315,7 +315,7 @@
libshill-client \
libssl \
libexpat \
- libchromeos-policy \
+ libbrillo-policy \
libhardware \
libcutils \
libprotobuf-cpp-lite-rtti \
@@ -355,8 +355,8 @@
LOCAL_SHARED_LIBRARIES := \
libchrome \
libchrome-dbus \
- libchromeos \
- libchromeos-dbus
+ libbrillo \
+ libbrillo-dbus
LOCAL_STATIC_LIBRARIES := \
update_engine_client-dbus-proxies
LOCAL_SRC_FILES := \
diff --git a/dbus_service.cc b/dbus_service.cc
index 2d426e4..1bde41c 100644
--- a/dbus_service.cc
+++ b/dbus_service.cc
@@ -150,7 +150,7 @@
const policy::DevicePolicy* device_policy = system_state_->device_policy();
// The device_policy is loaded in a lazy way before an update check. Load it
- // now from the libchromeos cache if it wasn't already loaded.
+ // now from the libbrillo cache if it wasn't already loaded.
if (!device_policy) {
UpdateAttempter* update_attempter = system_state_->update_attempter();
if (update_attempter) {
@@ -223,7 +223,7 @@
const policy::DevicePolicy* device_policy = system_state_->device_policy();
// The device_policy is loaded in a lazy way before an update check. Load it
- // now from the libchromeos cache if it wasn't already loaded.
+ // now from the libbrillo cache if it wasn't already loaded.
if (!device_policy) {
UpdateAttempter* update_attempter = system_state_->update_attempter();
if (update_attempter) {
@@ -261,7 +261,7 @@
// The device_policy is loaded in a lazy way before an update check and is
// used to determine if an update is allowed over cellular. Load the device
- // policy now from the libchromeos cache if it wasn't already loaded.
+ // policy now from the libbrillo cache if it wasn't already loaded.
if (!system_state_->device_policy()) {
UpdateAttempter* update_attempter = system_state_->update_attempter();
if (update_attempter)
diff --git a/update_attempter.h b/update_attempter.h
index fa2c18a..5debf21 100644
--- a/update_attempter.h
+++ b/update_attempter.h
@@ -168,9 +168,9 @@
// Called at update_engine startup to do various house-keeping.
void UpdateEngineStarted();
- // Reloads the device policy from libchromeos. Note: This method doesn't
+ // Reloads the device policy from libbrillo. Note: This method doesn't
// cause a real-time policy fetch from the policy server. It just reloads the
- // latest value that libchromeos has cached. libchromeos fetches the policies
+ // latest value that libbrillo has cached. libbrillo fetches the policies
// from the server asynchronously at its own frequency.
virtual void RefreshDevicePolicy();
diff --git a/update_engine.gyp b/update_engine.gyp
index 52b8f0f..0749503 100644
--- a/update_engine.gyp
+++ b/update_engine.gyp
@@ -17,8 +17,8 @@
'target_defaults': {
'variables': {
'deps': [
+ 'libbrillo-<(libbase_ver)',
'libchrome-<(libbase_ver)',
- 'libchromeos-<(libbase_ver)',
],
# Defaults if the -DUSE_* flags are not passed to gyp is 0. You can set
# the default value for the USE flag in the ebuild.
@@ -373,7 +373,7 @@
'includes': ['../../../platform2/common-mk/common_test.gypi'],
'variables': {
'deps': [
- 'libchromeos-test-<(libbase_ver)',
+ 'libbrillo-test-<(libbase_ver)',
'libchrome-test-<(libbase_ver)',
'libdebugd-client-test',
'libpower_manager-client-test',