weaved: Rename libchromeos into libbrillo
BUG: 24872993
Change-Id: I9f3c364c09428319f895079fa1f99fa0aea70b93
diff --git a/Android.mk b/Android.mk
index f207dbe..0c6009d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -37,12 +37,12 @@
buffetSharedLibraries := \
libapmanager-client \
libavahi-common \
+ libbrillo \
+ libbrillo-dbus \
+ libbrillo-http \
+ libbrillo-stream \
libchrome \
libchrome-dbus \
- libchromeos \
- libchromeos-dbus \
- libchromeos-http \
- libchromeos-stream \
libdbus \
libshill-client \
libweave \
@@ -175,9 +175,9 @@
LOCAL_STATIC_LIBRARIES := \
buffet-common \
+ libbrillo-test-helpers \
libchrome_dbus_test_helpers \
libchrome_test_helpers \
- libchromeos-test-helpers \
libgtest \
libgmock \
libweave-test \
diff --git a/buffet/buffet.gyp b/buffet/buffet.gyp
index 710219c..3eeaa44 100644
--- a/buffet/buffet.gyp
+++ b/buffet/buffet.gyp
@@ -2,8 +2,8 @@
'target_defaults': {
'variables': {
'deps': [
+ 'libbrillo-<(libbase_ver)',
'libchrome-<(libbase_ver)',
- 'libchromeos-<(libbase_ver)',
'system_api',
],
},
@@ -143,8 +143,8 @@
],
'variables': {
'deps': [
+ 'libbrillo-test-<(libbase_ver)',
'libchrome-test-<(libbase_ver)',
- 'libchromeos-test-<(libbase_ver)',
'libweave-test-<(libbase_ver)',
],
},