Resolved conflicts for merge of 6df7b609 to lmp-dev-plus-aosp.

Change-Id: I204e5701031c9ba9cd783c0db58cd51d93a5dc61
This commit is contained in:
Dan Albert 2014-08-18 14:58:13 -07:00
commit 247e441b0c

View file

@ -821,7 +821,8 @@ LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
LOCAL_CPPFLAGS := $(libc_common_cppflags)
LOCAL_C_INCLUDES := $(libc_common_c_includes)
LOCAL_MODULE := libc_cxa
LOCAL_CLANG := true # GCC refuses to hide new/delete
# GCC refuses to hide new/delete
LOCAL_CLANG := true
LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
LOCAL_SYSTEM_SHARED_LIBRARIES :=