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

Commit 5b7563a0 authored by Alex Vakulenko's avatar Alex Vakulenko Committed by Gerrit Code Review
Browse files

Merge "Disable RTTI in crash_reporter and metricsd"

parents 100001a5 20960297

crash_reporter/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := libcrash

LOCAL_CPP_EXTENSION := $(crash_reporter_cpp_extension)

LOCAL_C_INCLUDES := $(crash_reporter_includes)

LOCAL_RTTI_FLAG := -frtti

LOCAL_SHARED_LIBRARIES := libchrome \

    libbinder \

    libbrillo \
@@ -63,7 +62,6 @@ LOCAL_REQUIRED_MODULES := core2md \ 
    crash_sender \

    crash_server

LOCAL_INIT_RC := crash_reporter.rc

LOCAL_RTTI_FLAG := -frtti

LOCAL_SHARED_LIBRARIES := libchrome \

    libbinder \

    libbrillo \

metricsd/Android.mk

+0 −4
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ LOCAL_SRC_FILES := \ 
  aidl/android/brillo/metrics/IMetricsCollectorService.aidl \

  metrics_collector_service_impl.cc \

  metrics_collector_service_client.cc

LOCAL_RTTI_FLAG := -fno-rtti

include $(BUILD_STATIC_LIBRARY)



# Shared library for metrics.
@@ -122,7 +121,6 @@ LOCAL_CFLAGS := $(metrics_CFLAGS) 
LOCAL_CLANG := true

LOCAL_CPP_EXTENSION := $(metrics_cpp_extension)

LOCAL_CPPFLAGS := $(metrics_CPPFLAGS)

LOCAL_RTTI_FLAG := -frtti

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

LOCAL_SHARED_LIBRARIES := $(libmetrics_shared_libraries)

LOCAL_SRC_FILES := $(libmetrics_sources)
@@ -166,7 +164,6 @@ LOCAL_CPP_EXTENSION := $(metrics_cpp_extension) 
LOCAL_CPPFLAGS := $(metrics_CPPFLAGS)

LOCAL_INIT_RC := metrics_collector.rc

LOCAL_REQUIRED_MODULES := metrics.json

LOCAL_RTTI_FLAG := -frtti

LOCAL_SHARED_LIBRARIES := $(metrics_collector_shared_libraries)

LOCAL_SRC_FILES := $(metrics_collector_common) \

  metrics_collector_main.cc
@@ -213,7 +210,6 @@ LOCAL_CFLAGS := $(metrics_CFLAGS) 
LOCAL_CLANG := true

LOCAL_CPP_EXTENSION := $(metrics_cpp_extension)

LOCAL_CPPFLAGS := $(metrics_CPPFLAGS) -Wno-sign-compare

LOCAL_RTTI_FLAG := -frtti

LOCAL_SHARED_LIBRARIES := $(metrics_collector_shared_libraries)

LOCAL_SRC_FILES := $(metrics_collector_tests_sources) \

  $(metrics_collector_common)