Update aosp/master LLVM for rebase to r256229

[android-x86/external-llvm.git] / lib / Transforms / Instrumentation / Android.mk

diff --git a/lib/Transforms/Instrumentation/Android.mk b/lib/Transforms/Instrumentation/Android.mk
index 9736619..de47d25 100644 (file)
--- a/lib/Transforms/Instrumentation/Android.mk
+++ b/lib/Transforms/Instrumentation/Android.mk
@@ -2,15 +2,15 @@ LOCAL_PATH:= $(call my-dir)
 
 instrumentation_SRC_FILES := \
   AddressSanitizer.cpp \
-  BlackList.cpp \
   BoundsChecking.cpp \
-  EdgeProfiling.cpp \
+  DataFlowSanitizer.cpp \
   GCOVProfiling.cpp \
+  InstrProfiling.cpp \
   Instrumentation.cpp \
   MemorySanitizer.cpp \
-  OptimalEdgeProfiling.cpp \
-  PathProfiling.cpp \
-  ProfilingUtils.cpp \
+  PGOInstrumentation.cpp \
+  SafeStack.cpp \
+  SanitizerCoverage.cpp \
   ThreadSanitizer.cpp
 
 # For the host
@@ -18,21 +18,24 @@ instrumentation_SRC_FILES := \
 include $(CLEAR_VARS)
 
 LOCAL_MODULE:= libLLVMInstrumentation
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(instrumentation_SRC_FILES)
 
 include $(LLVM_HOST_BUILD_MK)
+include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the target
 # =====================================================
+ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
 LOCAL_MODULE:= libLLVMInstrumentation
-LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(instrumentation_SRC_FILES)
 
 include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
+endif