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

Commit e804fc92 authored by Doug Kwan's avatar Doug Kwan Committed by Android (Google) Code Review
Browse files

Merge "Allow enabling RTTI in a module."

parents 149dd914 9a8ecf97

core/binary.mk

+4 −0
Original line number Original line Diff line number Diff line
@@ -574,6 +574,9 @@ installed_static_library_notice_file_targets := \ 
    $(foreach lib,$(LOCAL_STATIC_LIBRARIES) $(LOCAL_WHOLE_STATIC_LIBRARIES), \

    $(foreach lib,$(LOCAL_STATIC_LIBRARIES) $(LOCAL_WHOLE_STATIC_LIBRARIES), \

      NOTICE-$(if $(LOCAL_IS_HOST_MODULE),HOST,TARGET)-STATIC_LIBRARIES-$(lib))

      NOTICE-$(if $(LOCAL_IS_HOST_MODULE),HOST,TARGET)-STATIC_LIBRARIES-$(lib))





# Default is -fno-rtti.

LOCAL_RTTI_FLAG ?= -fno-rtti



###########################################################

###########################################################

# Rule-specific variable definitions

# Rule-specific variable definitions

###########################################################

###########################################################
@@ -581,6 +584,7 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_YACCFLAGS := $(LOCAL_YACCFLAGS) 
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ASFLAGS := $(LOCAL_ASFLAGS)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ASFLAGS := $(LOCAL_ASFLAGS)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CFLAGS := $(LOCAL_CFLAGS)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CFLAGS := $(LOCAL_CFLAGS)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CPPFLAGS := $(LOCAL_CPPFLAGS)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CPPFLAGS := $(LOCAL_CPPFLAGS)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RTTI_FLAG := $(LOCAL_RTTI_FLAG)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_DEBUG_CFLAGS := $(debug_cflags)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_DEBUG_CFLAGS := $(debug_cflags)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_C_INCLUDES := $(LOCAL_C_INCLUDES)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_C_INCLUDES := $(LOCAL_C_INCLUDES)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_LDFLAGS := $(LOCAL_LDFLAGS)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_LDFLAGS := $(LOCAL_LDFLAGS)

core/definitions.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -868,7 +868,7 @@ $(hide) $(PRIVATE_CXX) \ 
	    $(PRIVATE_TARGET_GLOBAL_CPPFLAGS) \

	    $(PRIVATE_TARGET_GLOBAL_CPPFLAGS) \

	    $(PRIVATE_ARM_CFLAGS) \

	    $(PRIVATE_ARM_CFLAGS) \

	 ) \

	 ) \

	-fno-rtti \

	$(PRIVATE_RTTI_FLAG) \

	$(PRIVATE_CFLAGS) \

	$(PRIVATE_CFLAGS) \

	$(PRIVATE_CPPFLAGS) \

	$(PRIVATE_CPPFLAGS) \

	$(PRIVATE_DEBUG_CFLAGS) \

	$(PRIVATE_DEBUG_CFLAGS) \