Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ac83e41 authored by Alex Vakulenko's avatar Alex Vakulenko Committed by Gerrit Code Review
Browse files

Merge "core: Rename libchromeos into libbrillo"

parents f7416174 26aef373

crash_reporter/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -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

metricsd/Android.mk

+4 −5
Original line number Diff line number Diff line
@@ -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)

metricsd/libmetrics.gypi

+1 −1
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
  'target_defaults': {

    'variables': {

      'deps': [

        'libbrillo-<(libbase_ver)',

        'libchrome-<(libbase_ver)',

        'libchromeos-<(libbase_ver)',

      ]

    },

    'cflags_cc': [

metricsd/metrics.gyp

+1 −1
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 
    'variables': {

      'deps': [

        'dbus-1',

        'libbrillo-<(libbase_ver)',

        'libchrome-<(libbase_ver)',

        'libchromeos-<(libbase_ver)',

      ]

    },

    'cflags_cc': [

metricsd/uploader/sender_http.h

+1 −1
Original line number Diff line number Diff line
@@ -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);