DO NOT MERGE.

Magenta changes required to build scudo.

This is very rough.

Change-Id: I8c2b70172b713e19caef0d5c477a3d3e543b84d5

make/ucompile.mk

@@ -8,13 +8,15 @@
 # create a separate list of objects per source type
 MODULE_CSRCS := $(filter %.c,$(MODULE_SRCS))
 MODULE_CPPSRCS := $(filter %.cpp,$(MODULE_SRCS))
+MODULE_CCSRCS := $(filter %.cc,$(MODULE_SRCS))
 MODULE_ASMSRCS := $(filter %.S,$(MODULE_SRCS))
 
 MODULE_COBJS := $(call TOMODULEDIR,$(patsubst %.c,%.c.o,$(MODULE_CSRCS)))
 MODULE_CPPOBJS := $(call TOMODULEDIR,$(patsubst %.cpp,%.cpp.o,$(MODULE_CPPSRCS)))
+MODULE_CCOBJS := $(call TOMODULEDIR,$(patsubst %.cc,%.cc.o,$(MODULE_CCSRCS)))
 MODULE_ASMOBJS := $(call TOMODULEDIR,$(patsubst %.S,%.S.o,$(MODULE_ASMSRCS)))
 
-MODULE_OBJS := $(MODULE_COBJS) $(MODULE_CPPOBJS) $(MODULE_ASMOBJS)
+MODULE_OBJS := $(MODULE_COBJS) $(MODULE_CPPOBJS) $(MODULE_CCOBJS) $(MODULE_ASMOBJS)
 
 #$(info MODULE_SRCS = $(MODULE_SRCS))
 #$(info MODULE_CSRCS = $(MODULE_CSRCS))
@@ -43,6 +45,11 @@ $(MODULE_CPPOBJS): $(MODULE_BUILDDIR)/%.cpp.o: %.cpp $(MODULE_SRCDEPS)
 	$(call BUILDECHO, compiling $<)
 	$(NOECHO)$(CC) $(GLOBAL_OPTFLAGS) $(MODULE_OPTFLAGS) $(GLOBAL_COMPILEFLAGS) $(USER_COMPILEFLAGS) $(ARCH_COMPILEFLAGS) $(MODULE_COMPILEFLAGS) $(GLOBAL_CPPFLAGS) $(USER_CPPFLAGS) $(ARCH_CPPFLAGS) $(MODULE_CPPFLAGS) $(GLOBAL_INCLUDES) -c $< -MMD -MP -MT $@ -MF $(@:%o=%d) -o $@
 
+$(MODULE_CCOBJS): $(MODULE_BUILDDIR)/%.cc.o: %.cc $(MODULE_SRCDEPS)
+	@$(MKDIR)
+	$(call BUILDECHO, compiling $<)
+	$(NOECHO)$(CC) $(GLOBAL_OPTFLAGS) $(MODULE_OPTFLAGS) $(GLOBAL_COMPILEFLAGS) $(USER_COMPILEFLAGS) $(ARCH_COMPILEFLAGS) $(MODULE_COMPILEFLAGS) $(GLOBAL_CPPFLAGS) $(USER_CPPFLAGS) $(ARCH_CPPFLAGS) $(MODULE_CPPFLAGS) $(GLOBAL_INCLUDES) -c $< -MMD -MP -MT $@ -MF $(@:%o=%d) -o $@
+
 $(MODULE_ASMOBJS): $(MODULE_BUILDDIR)/%.S.o: %.S $(MODULE_SRCDEPS)
 	@$(MKDIR)
 	$(call BUILDECHO, compiling $<)
@@ -57,5 +64,3 @@ MODULE_CPPOBJS :=
 MODULE_ASMOBJS :=
 
 # MODULE_OBJS is passed back
-#MODULE_OBJS :=
-

third_party/ulib/musl/musl-rules.mk

@@ -1090,7 +1090,9 @@ endif
 include $(LOCAL_DIR)/src/string/rules.mk
 
 # Include jemalloc for our malloc implementation
-include $(LOCAL_DIR)/../jemalloc/rules.mk
+#include $(LOCAL_DIR)/../jemalloc/rules.mk
+
+include $(LOCAL_DIR)/../../../../third_party/llvm/runtimes/compiler-rt/lib/rules.mk
 
 
 # shared library (which is also the dynamic linker)