diff options
| author | Alex Vakulenko <avakulenko@google.com> | 2015-10-27 22:46:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-10-27 22:46:48 +0000 |
| commit | 520dad65f387d889cf8143bd7f35d8babaa63822 (patch) | |
| tree | dd575ce57d1dab1722ab0cfa9caa5eb377763334 | |
| parent | 6789bcbfbc2cbc7eec7713513b4b2038f7f8c52c (diff) | |
| parent | 9ad78a5f14b72297699d5a552846982e42eb6b4d (diff) | |
| download | apmanager-520dad65f387d889cf8143bd7f35d8babaa63822.tar.gz | |
Merge "apmanager: Rename libchromeos to libbrillo"
| -rw-r--r-- | Android.mk | 6 | ||||
| -rw-r--r-- | apmanager.gyp | 2 |
2 files changed, 4 insertions, 4 deletions
@@ -22,11 +22,11 @@ define apmanager_common 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 \ 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': [ |