From b7a2c4cfb7cf3024b3a64dff9ecb0cf99545bff7 Mon Sep 17 00:00:00 2001
From: Alex Vakulenko <avakulenko@google.com>
Date: Mon, 21 Dec 2015 12:18:33 -0800
Subject: [PATCH] ledflasher: Disable RTTI
There is no longer a reliance on RTTI in libbrillo, so disable RTTI
in the rest of Brillo codebase.
With RTTI disabled, we rely on __PRETTY_FUNCTION__ macro to infer some
type names. Unfortunately CLANG and GCC use different decorations for
template types with default parameters (such as std::vector and std::map)
which causes problems.
Since most of Brillo code is compiled with clang, use that for code
that relies on brillo::Any.
BUG: 26292405
Change-Id: I922649add010fd68dab90146894494864f44c02e
---
src/ledflasher/Android.mk | 2 +-
src/ledservice/Android.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ledflasher/Android.mk b/src/ledflasher/Android.mk
index 12d9cac..eea3ac9 100644
--- a/src/ledflasher/Android.mk
+++ b/src/ledflasher/Android.mk
@@ -37,7 +37,7 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_C_INCLUDES := external/gtest/include
LOCAL_CFLAGS := -Wall -Werror -Wno-sign-promo -Wno-error=unused-parameter
-LOCAL_RTTI_FLAG := -frtti
+LOCAL_CLANG := true
include $(BUILD_EXECUTABLE)
diff --git a/src/ledservice/Android.mk b/src/ledservice/Android.mk
index 12054ce..e263399 100644
--- a/src/ledservice/Android.mk
+++ b/src/ledservice/Android.mk
@@ -35,6 +35,7 @@ LOCAL_SHARED_LIBRARIES := \
libhardware \
libutils \
+LOCAL_CLANG := true
LOCAL_C_INCLUDES := external/gtest/include
LOCAL_CFLAGS := \
-Wall \
@@ -42,7 +43,6 @@ LOCAL_CFLAGS := \
-Wno-sign-promo \
-Wno-missing-field-initializers \
-Wno-error=unused-parameter
-LOCAL_RTTI_FLAG := -frtti
include $(BUILD_EXECUTABLE)
--
GitLab