diff options
| -rw-r--r-- | crash_reporter/Android.mk | 6 | ||||
| -rw-r--r-- | metricsd/Android.mk | 9 | ||||
| -rw-r--r-- | metricsd/libmetrics.gypi | 2 | ||||
| -rw-r--r-- | metricsd/metrics.gyp | 2 | ||||
| -rw-r--r-- | metricsd/uploader/sender_http.h | 2 |
5 files changed, 10 insertions, 11 deletions
diff --git a/crash_reporter/Android.mk b/crash_reporter/Android.mk index 5dd9418fdd..c5ca4e40c2 100644 --- a/crash_reporter/Android.mk +++ b/crash_reporter/Android.mk @@ -43,7 +43,7 @@ LOCAL_CPP_EXTENSION := $(crash_reporter_cpp_extension) LOCAL_C_INCLUDES := $(crash_reporter_includes) LOCAL_RTTI_FLAG := -frtti LOCAL_SHARED_LIBRARIES := libchrome \ - libchromeos \ + libbrillo \ libcutils \ libdbus \ libmetrics \ @@ -65,7 +65,7 @@ LOCAL_REQUIRED_MODULES := core2md \ LOCAL_INIT_RC := crash_reporter.rc LOCAL_RTTI_FLAG := -frtti LOCAL_SHARED_LIBRARIES := libchrome \ - libchromeos \ + libbrillo \ libcutils \ libdbus \ libmetrics \ @@ -134,7 +134,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := crash_reporter_tests LOCAL_CPP_EXTENSION := $(crash_reporter_cpp_extension) LOCAL_SHARED_LIBRARIES := libchrome \ - libchromeos \ + libbrillo \ libcutils \ libdbus \ libpcrecpp diff --git a/metricsd/Android.mk b/metricsd/Android.mk index 8dbaad9fba..b08c153e4b 100644 --- a/metricsd/Android.mk +++ b/metricsd/Android.mk @@ -64,11 +64,11 @@ metrics_CPPFLAGS := -Wno-non-virtual-dtor \ -fvisibility=default metrics_includes := external/gtest/include \ $(LOCAL_PATH)/include -libmetrics_shared_libraries := libchrome libchromeos +libmetrics_shared_libraries := libchrome libbrillo metrics_daemon_shared_libraries := $(libmetrics_shared_libraries) \ + libbrillo-http \ + libbrillo-dbus \ libchrome-dbus \ - libchromeos-http \ - libchromeos-dbus \ libdbus \ libmetrics \ libprotobuf-cpp-lite \ @@ -120,8 +120,7 @@ include $(BUILD_STATIC_LIBRARY) # ======================================================== include $(CLEAR_VARS) LOCAL_MODULE := metrics_daemon -LOCAL_C_INCLUDES := $(metrics_includes) \ - external/libchromeos +LOCAL_C_INCLUDES := $(metrics_includes) LOCAL_CFLAGS := $(metrics_CFLAGS) LOCAL_CPP_EXTENSION := $(metrics_cpp_extension) LOCAL_CPPFLAGS := $(metrics_CPPFLAGS) diff --git a/metricsd/libmetrics.gypi b/metricsd/libmetrics.gypi index 5b90a550ca..3c8fc7c608 100644 --- a/metricsd/libmetrics.gypi +++ b/metricsd/libmetrics.gypi @@ -2,8 +2,8 @@ 'target_defaults': { 'variables': { 'deps': [ + 'libbrillo-<(libbase_ver)', 'libchrome-<(libbase_ver)', - 'libchromeos-<(libbase_ver)', ] }, 'cflags_cc': [ diff --git a/metricsd/metrics.gyp b/metricsd/metrics.gyp index 276ec7876a..c9c02d7521 100644 --- a/metricsd/metrics.gyp +++ b/metricsd/metrics.gyp @@ -3,8 +3,8 @@ 'variables': { 'deps': [ 'dbus-1', + 'libbrillo-<(libbase_ver)', 'libchrome-<(libbase_ver)', - 'libchromeos-<(libbase_ver)', ] }, 'cflags_cc': [ diff --git a/metricsd/uploader/sender_http.h b/metricsd/uploader/sender_http.h index 6249d90663..4f1c08f27b 100644 --- a/metricsd/uploader/sender_http.h +++ b/metricsd/uploader/sender_http.h @@ -23,7 +23,7 @@ #include "uploader/sender.h" -// Sender implemented using http_utils from libchromeos +// Sender implemented using http_utils from libbrillo class HttpSender : public Sender { public: explicit HttpSender(std::string server_url); |