From e3c3c6d4fecf12e725dbf0f5bb9967787149c457 Mon Sep 17 00:00:00 2001
From: Doug Kwan <dougkwan@google.com>
Date: Tue, 7 Jun 2011 10:55:48 -0700
Subject: [PATCH] Allow per module RTTI setting.  This fixes a bug in previous
 check-ins.

Change-Id: I5fcac192a7945720fd7667f7497078d310370bc5
---
 core/binary.mk     | 4 +++-
 core/clear_vars.mk | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/binary.mk b/core/binary.mk
index d6ccfbfbd5..61026d2e98 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -575,7 +575,9 @@ installed_static_library_notice_file_targets := \
       NOTICE-$(if $(LOCAL_IS_HOST_MODULE),HOST,TARGET)-STATIC_LIBRARIES-$(lib))
 
 # Default is -fno-rtti.
-LOCAL_RTTI_FLAG ?= -fno-rtti
+ifeq ($(strip $(LOCAL_RTTI_FLAG)),)
+LOCAL_RTTI_FLAG := -fno-rtti
+endif
 
 ###########################################################
 # Rule-specific variable definitions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index ab6efd4ea7..bc085f5d73 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -42,6 +42,7 @@ LOCAL_YACCFLAGS:=
 LOCAL_ASFLAGS:=
 LOCAL_CFLAGS:=
 LOCAL_CPPFLAGS:=
+LOCAL_RTTI_FLAG:=
 LOCAL_C_INCLUDES:=
 LOCAL_LDFLAGS:=
 LOCAL_LDLIBS:=