aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Vakulenko <avakulenko@google.com>2015-12-21 12:23:16 -0800
committerAlex Vakulenko <avakulenko@google.com>2016-01-04 11:12:48 -0800
commit42f7f1fb86e5ad28a8d20f919701f2e3747ad585 (patch)
treeb9f1288aa5fea984c75b2fcffaed1d9415d65721
parent0ba1eeffb4c326fa3c4e526fb53f1533c0385bab (diff)
downloadmetricsd-42f7f1fb86e5ad28a8d20f919701f2e3747ad585.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--Android.mk4
1 files changed, 0 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index 2149a4b..2cd1f7b 100644
--- a/Android.mk
+++ b/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)