diff options
| author | Alex Vakulenko <avakulenko@google.com> | 2015-12-21 12:23:16 -0800 |
|---|---|---|
| committer | Alex Vakulenko <avakulenko@google.com> | 2016-01-04 11:12:48 -0800 |
| commit | 20960297438bf07ccfa5bd2a507eb31b5932da73 (patch) | |
| tree | a5d9dcc25401b4d67380e3f539de29c124596997 | |
| parent | 100001a537446e731f75daadfe75ab78203df45e (diff) | |
| download | core-20960297438bf07ccfa5bd2a507eb31b5932da73.tar.gz | |
Disable RTTI in crash_reporter and metricsd
There is no longer a reliance on RTTI in libbrillo, so disable RTTI
in the rest of Brillo codebase.
Bug: 26292405
Change-Id: I2751a2ac973a74741a82f5cd949fc0adaf2449a6
| -rw-r--r-- | crash_reporter/Android.mk | 2 | ||||
| -rw-r--r-- | metricsd/Android.mk | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/crash_reporter/Android.mk b/crash_reporter/Android.mk index 565963cbc..bc023b0b9 100644 --- a/crash_reporter/Android.mk +++ b/crash_reporter/Android.mk @@ -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 \ diff --git a/metricsd/Android.mk b/metricsd/Android.mk index 2149a4bd4..2cd1f7bfb 100644 --- a/metricsd/Android.mk +++ b/metricsd/Android.mk @@ -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) |