commit 520dad65f387d889cf8143bd7f35d8babaa63822
author Alex Vakulenko <avakulenko@google.com> Tue Oct 27 22:46:48 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 27 22:46:48 2015 +0000
tree dd575ce57d1dab1722ab0cfa9caa5eb377763334
parent 6789bcbfbc2cbc7eec7713513b4b2038f7f8c52c
parent 9ad78a5f14b72297699d5a552846982e42eb6b4d

Merge "apmanager: Rename libchromeos to libbrillo"

Android.mk

diff --git a/Android.mk b/Android.mk
index f9f0888..c8f4bf8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,11 +22,11 @@
   LOCAL_RTTI_FLAG := -frtti
   LOCAL_CLANG := true
   LOCAL_SHARED_LIBRARIES += \
+      libbrillo \
+      libbrillo-dbus \
+      libbrillo-minijail \
       libchrome \
       libchrome-dbus \
-      libchromeos \
-      libchromeos-dbus \
-      libchromeos-minijail \
       libdbus \
       libfirewalld-client \
       libminijail \

apmanager.gyp

diff --git a/apmanager.gyp b/apmanager.gyp
index 23f4b24..100f410 100644
--- a/apmanager.gyp
+++ b/apmanager.gyp
@@ -18,8 +18,8 @@
   'target_defaults': {
     'variables': {
       'deps': [
+        'libbrillo-<(libbase_ver)',
         'libchrome-<(libbase_ver)',
-        'libchromeos-<(libbase_ver)',
       ],
     },
     'cflags': [