DO NOT MERGE.

Magenta changes required to build scudo.

This is very rough.

Change-Id: I8c2b70172b713e19caef0d5c477a3d3e543b84d5
Esse commit está contido em:
Julia Hansbrough
2017-08-14 16:33:34 -07:00
commit 46c3c643ce
+1 -1
Ver Arquivo
@@ -1090,7 +1090,7 @@ 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