LLVM_DEVICE_BUILD_MK to LLVM70_DEVICE_BUILD_MK

find . -type f -name "*.mk" -exec sed -i 's/LLVM_DEVICE_BUILD_MK/LLVM70_DEVICE_BUILD_MK/g' {} +

Change-Id: If859305d7d6220a8a7cf49a515f09a008162c091

diff --git a/lib/Analysis/Android.mk b/lib/Analysis/Android.mk
index b0c1907..6ec1610 100644 (file)
--- a/lib/Analysis/Android.mk
+++ b/lib/Analysis/Android.mk
@@ -106,7 +106,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE:= libLLVM70Analysis
 LOCAL_SRC_FILES := $(analysis_SRC_FILES)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/BinaryFormat/Android.mk b/lib/BinaryFormat/Android.mk
index 94a09b4..1ff1711 100644 (file)
--- a/lib/BinaryFormat/Android.mk
+++ b/lib/BinaryFormat/Android.mk
@@ -28,7 +28,7 @@ LOCAL_SRC_FILES := $(binary_format_SRC_FILES)
 
 LOCAL_MODULE:= libLLVM70BinaryFormat
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Bitcode/Reader/Android.mk b/lib/Bitcode/Reader/Android.mk
index 7b11326..e613608 100644 (file)
--- a/lib/Bitcode/Reader/Android.mk
+++ b/lib/Bitcode/Reader/Android.mk
@@ -31,7 +31,7 @@ LOCAL_SRC_FILES := $(bitcode_reader_SRC_FILES)
 
 LOCAL_MODULE:= libLLVM70BitReader
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Bitcode/Writer/Android.mk b/lib/Bitcode/Writer/Android.mk
index 8253765..09ebdbb 100644 (file)
--- a/lib/Bitcode/Writer/Android.mk
+++ b/lib/Bitcode/Writer/Android.mk
@@ -30,7 +30,7 @@ LOCAL_SRC_FILES := $(bitcode_writer_SRC_FILES)
 
 LOCAL_MODULE:= libLLVM70BitWriter
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/CodeGen/Android.mk b/lib/CodeGen/Android.mk
index 4227624..71e7c71 100644 (file)
--- a/lib/CodeGen/Android.mk
+++ b/lib/CodeGen/Android.mk
@@ -178,7 +178,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(codegen_SRC_FILES)
 LOCAL_MODULE:= libLLVM70CodeGen
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/CodeGen/AsmPrinter/Android.mk b/lib/CodeGen/AsmPrinter/Android.mk
index cdcf76a..899e7e2 100644 (file)
--- a/lib/CodeGen/AsmPrinter/Android.mk
+++ b/lib/CodeGen/AsmPrinter/Android.mk
@@ -47,7 +47,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(codegen_asmprinter_SRC_FILES)
 LOCAL_MODULE:= libLLVM70AsmPrinter
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/CodeGen/GlobalISel/Android.mk b/lib/CodeGen/GlobalISel/Android.mk
index d054d13..47bc7f4 100644 (file)
--- a/lib/CodeGen/GlobalISel/Android.mk
+++ b/lib/CodeGen/GlobalISel/Android.mk
@@ -46,7 +46,7 @@ LOCAL_MODULE:= libLLVM70GlobalISel
 
 LOCAL_MODULE_TAGS := optional
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/CodeGen/MIRParser/Android.mk b/lib/CodeGen/MIRParser/Android.mk
index 322cd5b..30668ec 100644 (file)
--- a/lib/CodeGen/MIRParser/Android.mk
+++ b/lib/CodeGen/MIRParser/Android.mk
@@ -30,7 +30,7 @@ LOCAL_MODULE:= libLLVM70MIRParser
 
 LOCAL_MODULE_TAGS := optional
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/CodeGen/SelectionDAG/Android.mk b/lib/CodeGen/SelectionDAG/Android.mk
index fa12219..39ab40d 100644 (file)
--- a/lib/CodeGen/SelectionDAG/Android.mk
+++ b/lib/CodeGen/SelectionDAG/Android.mk
@@ -52,7 +52,7 @@ LOCAL_SRC_FILES := $(codegen_selectiondag_SRC_FILES)
 
 LOCAL_MODULE:= libLLVM70SelectionDAG
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/DebugInfo/CodeView/Android.mk b/lib/DebugInfo/CodeView/Android.mk
index 9ba473b..c9bc478 100644 (file)
--- a/lib/DebugInfo/CodeView/Android.mk
+++ b/lib/DebugInfo/CodeView/Android.mk
@@ -62,7 +62,7 @@ LOCAL_SRC_FILES := $(debuginfo_codeview_SRC_FILES)
 
 LOCAL_MODULE:= libLLVM70DebugInfoCodeView
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/DebugInfo/DWARF/Android.mk b/lib/DebugInfo/DWARF/Android.mk
index 8375381..d96bb1a 100644 (file)
--- a/lib/DebugInfo/DWARF/Android.mk
+++ b/lib/DebugInfo/DWARF/Android.mk
@@ -52,7 +52,7 @@ LOCAL_SRC_FILES := $(debuginfo_dwarf_SRC_FILES)
 
 LOCAL_MODULE:= libLLVM70DebugInfoDWARF
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/DebugInfo/MSF/Android.mk b/lib/DebugInfo/MSF/Android.mk
index f38730b..0235ee9 100644 (file)
--- a/lib/DebugInfo/MSF/Android.mk
+++ b/lib/DebugInfo/MSF/Android.mk
@@ -33,7 +33,7 @@ LOCAL_SRC_FILES := $(debuginfo_msf_SRC_FILES)
 
 LOCAL_MODULE:= libLLVM70DebugInfoMSF
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/DebugInfo/PDB/Android.mk b/lib/DebugInfo/PDB/Android.mk
index 6f0e4f9..34cc942 100644 (file)
--- a/lib/DebugInfo/PDB/Android.mk
+++ b/lib/DebugInfo/PDB/Android.mk
@@ -102,7 +102,7 @@ LOCAL_SRC_FILES := $(debuginfo_pdb_SRC_FILES)
 
 LOCAL_MODULE:= libLLVM70DebugInfoPDB
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/DebugInfo/Symbolize/Android.mk b/lib/DebugInfo/Symbolize/Android.mk
index 7b5c1bc..ecc5a51 100644 (file)
--- a/lib/DebugInfo/Symbolize/Android.mk
+++ b/lib/DebugInfo/Symbolize/Android.mk
@@ -28,7 +28,7 @@ LOCAL_SRC_FILES := $(debuginfo_symbolize_SRC_FILES)
 
 LOCAL_MODULE:= libLLVM70Symbolize
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Demangle/Android.mk b/lib/Demangle/Android.mk
index 65bd3bd..6d94fcb 100644 (file)
--- a/lib/Demangle/Android.mk
+++ b/lib/Demangle/Android.mk
@@ -24,7 +24,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE:= libLLVM70Demangle
 LOCAL_SRC_FILES := $(demangle_SRC_FILES)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/ExecutionEngine/Android.mk b/lib/ExecutionEngine/Android.mk
index 92762e0..4eb28fc 100644 (file)
--- a/lib/ExecutionEngine/Android.mk
+++ b/lib/ExecutionEngine/Android.mk
@@ -28,7 +28,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libLLVM70ExecutionEngine
 LOCAL_SRC_FILES := $(executionengine_SRC_FILES)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/ExecutionEngine/Interpreter/Android.mk b/lib/ExecutionEngine/Interpreter/Android.mk
index 9ba3720..6c0c8e7 100644 (file)
--- a/lib/ExecutionEngine/Interpreter/Android.mk
+++ b/lib/ExecutionEngine/Interpreter/Android.mk
@@ -27,7 +27,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(interpreter_SRC_FILES)
 LOCAL_MODULE := libLLVM70Interpreter
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/ExecutionEngine/MCJIT/Android.mk b/lib/ExecutionEngine/MCJIT/Android.mk
index a8f3c15..6b56658 100644 (file)
--- a/lib/ExecutionEngine/MCJIT/Android.mk
+++ b/lib/ExecutionEngine/MCJIT/Android.mk
@@ -25,7 +25,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(mcjit_SRC_FILES)
 LOCAL_MODULE := libLLVM70MCJIT
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/ExecutionEngine/Orc/Android.mk b/lib/ExecutionEngine/Orc/Android.mk
index 84bd827..fa9ca01 100644 (file)
--- a/lib/ExecutionEngine/Orc/Android.mk
+++ b/lib/ExecutionEngine/Orc/Android.mk
@@ -32,7 +32,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(orcjit_SRC_FILES)
 LOCAL_MODULE := libLLVM70OrcJIT
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/ExecutionEngine/RuntimeDyld/Android.mk b/lib/ExecutionEngine/RuntimeDyld/Android.mk
index 8536163..075b433 100644 (file)
--- a/lib/ExecutionEngine/RuntimeDyld/Android.mk
+++ b/lib/ExecutionEngine/RuntimeDyld/Android.mk
@@ -30,6 +30,6 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(runtimedyld_SRC_FILES)
 LOCAL_MODULE := libLLVM70RuntimeDyld
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/IR/Android.mk b/lib/IR/Android.mk
index b2159dc..95b8432 100644 (file)
--- a/lib/IR/Android.mk
+++ b/lib/IR/Android.mk
@@ -84,7 +84,7 @@ LOCAL_MODULE:= libLLVM70Core
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(call local-generated-sources-dir)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(LOCAL_PATH)/llvm-gen-local.mk

diff --git a/lib/IRReader/Android.mk b/lib/IRReader/Android.mk
index 26738cb..14454a4 100644 (file)
--- a/lib/IRReader/Android.mk
+++ b/lib/IRReader/Android.mk
@@ -31,7 +31,7 @@ LOCAL_SRC_FILES := $(irreader_SRC_FILES)
 
 LOCAL_MODULE:= libLLVM70IRReader
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/LTO/Android.mk b/lib/LTO/Android.mk
index ec1f605..200469e 100644 (file)
--- a/lib/LTO/Android.mk
+++ b/lib/LTO/Android.mk
@@ -35,7 +35,7 @@ LOCAL_MODULE:= libLLVM70LTO
 
 LOCAL_MODULE_TAGS := optional
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/LineEditor/Android.mk b/lib/LineEditor/Android.mk
index 4d6a0a2..5d81eb2 100644 (file)
--- a/lib/LineEditor/Android.mk
+++ b/lib/LineEditor/Android.mk
@@ -29,7 +29,7 @@ LOCAL_MODULE:= libLLVM70LineEditor
 
 LOCAL_MODULE_TAGS := optional
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Linker/Android.mk b/lib/Linker/Android.mk
index 906f753..a01ea3b 100644 (file)
--- a/lib/Linker/Android.mk
+++ b/lib/Linker/Android.mk
@@ -28,7 +28,7 @@ LOCAL_SRC_FILES := $(linker_SRC_FILES)
 
 LOCAL_MODULE:= libLLVM70Linker
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/MC/Android.mk b/lib/MC/Android.mk
index 02c7ed6..be3054e 100644 (file)
--- a/lib/MC/Android.mk
+++ b/lib/MC/Android.mk
@@ -78,6 +78,6 @@ LOCAL_SRC_FILES := $(mc_SRC_FILES)
 
 LOCAL_MODULE:= libLLVM70MC
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/MC/MCDisassembler/Android.mk b/lib/MC/MCDisassembler/Android.mk
index 8cb2a2e..0675cdf 100644 (file)
--- a/lib/MC/MCDisassembler/Android.mk
+++ b/lib/MC/MCDisassembler/Android.mk
@@ -32,6 +32,6 @@ LOCAL_MODULE:= libLLVM70MCDisassembler
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/MC/MCParser/Android.mk b/lib/MC/MCParser/Android.mk
index 07ea8b4..4ec447a 100644 (file)
--- a/lib/MC/MCParser/Android.mk
+++ b/lib/MC/MCParser/Android.mk
@@ -33,6 +33,6 @@ LOCAL_SRC_FILES := $(mc_parser_SRC_FILES)
 
 LOCAL_MODULE:= libLLVM70MCParser
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Object/Android.mk b/lib/Object/Android.mk
index 50d2cef..f6505dc 100644 (file)
--- a/lib/Object/Android.mk
+++ b/lib/Object/Android.mk
@@ -51,7 +51,7 @@ LOCAL_MODULE:= libLLVM70Object
 
 LOCAL_SRC_FILES := $(object_SRC_FILES)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/ObjectYAML/Android.mk b/lib/ObjectYAML/Android.mk
index 084a382..491c514 100644 (file)
--- a/lib/ObjectYAML/Android.mk
+++ b/lib/ObjectYAML/Android.mk
@@ -37,7 +37,7 @@ LOCAL_MODULE:= libLLVM70ObjectYAML
 
 LOCAL_SRC_FILES := $(object_yaml_SRC_FILES)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Option/Android.mk b/lib/Option/Android.mk
index 2f77dfe..61896b2 100644 (file)
--- a/lib/Option/Android.mk
+++ b/lib/Option/Android.mk
@@ -35,6 +35,6 @@ LOCAL_MODULE:= libLLVM70Option
 
 LOCAL_CFLAGS := -D__android__
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Passes/Android.mk b/lib/Passes/Android.mk
index 3e3ce24..166c2de 100644 (file)
--- a/lib/Passes/Android.mk
+++ b/lib/Passes/Android.mk
@@ -25,7 +25,7 @@ LOCAL_MODULE:= libLLVM70Passes
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(passes_SRC_FILES)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/ProfileData/Android.mk b/lib/ProfileData/Android.mk
index e51b8fa..dd20dfd 100644 (file)
--- a/lib/ProfileData/Android.mk
+++ b/lib/ProfileData/Android.mk
@@ -30,7 +30,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE:= libLLVM70ProfileData
 LOCAL_SRC_FILES := $(profiledata_SRC_FILES)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Support/Android.mk b/lib/Support/Android.mk
index acd6362..f776809 100644 (file)
--- a/lib/Support/Android.mk
+++ b/lib/Support/Android.mk
@@ -139,6 +139,6 @@ LOCAL_MODULE:= libLLVM70Support
 
 LOCAL_CFLAGS := -D__android__
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/TableGen/Android.mk b/lib/TableGen/Android.mk
index 9509015..83838b5 100644 (file)
--- a/lib/TableGen/Android.mk
+++ b/lib/TableGen/Android.mk
@@ -38,6 +38,6 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 #
 #LOCAL_MODULE_TAGS := optional
 #
-#include $(LLVM_DEVICE_BUILD_MK)
+#include $(LLVM70_DEVICE_BUILD_MK)
 #include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/AArch64/Android.mk b/lib/Target/AArch64/Android.mk
index 3edf260..2c71132 100644 (file)
--- a/lib/Target/AArch64/Android.mk
+++ b/lib/Target/AArch64/Android.mk
@@ -89,7 +89,7 @@ LOCAL_SRC_FILES := $(aarch64_codegen_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc
 TBLGEN_TABLES := $(aarch64_codegen_TBLGEN_TABLES)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/lib/Target/AArch64/AsmParser/Android.mk b/lib/Target/AArch64/AsmParser/Android.mk
index f5829ba..7e669fe 100644 (file)
--- a/lib/Target/AArch64/AsmParser/Android.mk
+++ b/lib/Target/AArch64/AsmParser/Android.mk
@@ -56,7 +56,7 @@ LOCAL_C_INCLUDES += $(aarch64_asm_parser_C_INCLUDES)
 TBLGEN_TABLES := $(aarch64_asm_parser_TBLGEN_TABLES)
 TBLGEN_TD_DIR := $(aarch64_asm_parser_TBLGEN_TD_DIR)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/AArch64/Disassembler/Android.mk b/lib/Target/AArch64/Disassembler/Android.mk
index 7ce346b..2bfc3cc 100644 (file)
--- a/lib/Target/AArch64/Disassembler/Android.mk
+++ b/lib/Target/AArch64/Disassembler/Android.mk
@@ -27,7 +27,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVM70AArch64Disassembler
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/lib/Target/AArch64/InstPrinter/Android.mk b/lib/Target/AArch64/InstPrinter/Android.mk
index a14e2a0..f644ded 100644 (file)
--- a/lib/Target/AArch64/InstPrinter/Android.mk
+++ b/lib/Target/AArch64/InstPrinter/Android.mk
@@ -50,7 +50,7 @@ LOCAL_C_INCLUDES+= \
 
 LOCAL_MODULE:= libLLVM70AArch64AsmPrinter
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/AArch64/MCTargetDesc/Android.mk b/lib/Target/AArch64/MCTargetDesc/Android.mk
index 379b37a..869762f 100644 (file)
--- a/lib/Target/AArch64/MCTargetDesc/Android.mk
+++ b/lib/Target/AArch64/MCTargetDesc/Android.mk
@@ -55,7 +55,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 TBLGEN_TABLES := $(aarch64_mc_desc_TBLGEN_TABLES)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/lib/Target/AArch64/TargetInfo/Android.mk b/lib/Target/AArch64/TargetInfo/Android.mk
index e9abf89..dbc31dd 100644 (file)
--- a/lib/Target/AArch64/TargetInfo/Android.mk
+++ b/lib/Target/AArch64/TargetInfo/Android.mk
@@ -47,7 +47,7 @@ LOCAL_C_INCLUDES +=   \
 
 LOCAL_MODULE:= libLLVM70AArch64Info
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/AArch64/Utils/Android.mk b/lib/Target/AArch64/Utils/Android.mk
index 41b7389..024c04a 100644 (file)
--- a/lib/Target/AArch64/Utils/Android.mk
+++ b/lib/Target/AArch64/Utils/Android.mk
@@ -23,7 +23,7 @@ LOCAL_MODULE:= libLLVM70AArch64Utils
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 TBLGEN_TABLES := $(aarch64_utils_TBLGEN_TABLES)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Target/AMDGPU/Android.mk b/lib/Target/AMDGPU/Android.mk
index ab64dfb..2a5750b 100644 (file)
--- a/lib/Target/AMDGPU/Android.mk
+++ b/lib/Target/AMDGPU/Android.mk
@@ -124,7 +124,7 @@ LOCAL_SRC_FILES := $(amdgpu_codegen_SRC_FILES)
 
 LOCAL_MODULE := libLLVM70AMDGPUCodeGen
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/lib/Target/AMDGPU/AsmParser/Android.mk b/lib/Target/AMDGPU/AsmParser/Android.mk
index 70b966b..05224a2 100644 (file)
--- a/lib/Target/AMDGPU/AsmParser/Android.mk
+++ b/lib/Target/AMDGPU/AsmParser/Android.mk
@@ -46,7 +46,7 @@ LOCAL_C_INCLUDES := $(amdgpu_asm_parser_C_INCLUDES)
 TBLGEN_TABLES := $(amdgpu_asm_parser_TBLGEN_TABLES)
 TBLGEN_TD_DIR := $(amdgpu_asm_parser_TBLGEN_TD_DIR)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/lib/Target/AMDGPU/Disassembler/Android.mk b/lib/Target/AMDGPU/Disassembler/Android.mk
index d31b9ea..48796d2 100644 (file)
--- a/lib/Target/AMDGPU/Disassembler/Android.mk
+++ b/lib/Target/AMDGPU/Disassembler/Android.mk
@@ -41,7 +41,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 TBLGEN_TABLES := $(amdgpu_disassembler_TBLGEN_TABLES)
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/AMDGPU/InstPrinter/Android.mk b/lib/Target/AMDGPU/InstPrinter/Android.mk
index 7072133..9d6db3d 100644 (file)
--- a/lib/Target/AMDGPU/InstPrinter/Android.mk
+++ b/lib/Target/AMDGPU/InstPrinter/Android.mk
@@ -41,7 +41,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 TBLGEN_TABLES := $(amdgpu_instprinter_TBLGEN_TABLES)
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/AMDGPU/MCTargetDesc/Android.mk b/lib/Target/AMDGPU/MCTargetDesc/Android.mk
index c8e31e8..2f8f78e 100644 (file)
--- a/lib/Target/AMDGPU/MCTargetDesc/Android.mk
+++ b/lib/Target/AMDGPU/MCTargetDesc/Android.mk
@@ -52,7 +52,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 TBLGEN_TABLES := $(amdgpu_mc_desc_TBLGEN_TABLES)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/lib/Target/AMDGPU/TargetInfo/Android.mk b/lib/Target/AMDGPU/TargetInfo/Android.mk
index 378baff..bf28449 100644 (file)
--- a/lib/Target/AMDGPU/TargetInfo/Android.mk
+++ b/lib/Target/AMDGPU/TargetInfo/Android.mk
@@ -43,7 +43,7 @@ TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 LOCAL_SRC_FILES := $(amdgpu_target_info_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/lib/Target/AMDGPU/Utils/Android.mk b/lib/Target/AMDGPU/Utils/Android.mk
index 0efa77c..0b95f99 100644 (file)
--- a/lib/Target/AMDGPU/Utils/Android.mk
+++ b/lib/Target/AMDGPU/Utils/Android.mk
@@ -45,7 +45,7 @@ LOCAL_MODULE := libLLVM70AMDGPUUtils
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 TBLGEN_TABLES := $(amdgpu_utils_TBLGEN_TABLES)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/lib/Target/ARM/Android.mk b/lib/Target/ARM/Android.mk
index 7df8847..66c07fd 100644 (file)
--- a/lib/Target/ARM/Android.mk
+++ b/lib/Target/ARM/Android.mk
@@ -90,7 +90,7 @@ LOCAL_SRC_FILES := $(arm_codegen_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc
 TBLGEN_TABLES := $(arm_codegen_TBLGEN_TABLES)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/lib/Target/ARM/AsmParser/Android.mk b/lib/Target/ARM/AsmParser/Android.mk
index e7bc7bb..3120164 100644 (file)
--- a/lib/Target/ARM/AsmParser/Android.mk
+++ b/lib/Target/ARM/AsmParser/Android.mk
@@ -55,7 +55,7 @@ LOCAL_C_INCLUDES += $(arm_asm_parser_C_INCLUDES)
 TBLGEN_TABLES := $(arm_asm_parser_TBLGEN_TABLES)
 TBLGEN_TD_DIR := $(arm_asm_parser_TBLGEN_TD_DIR)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/ARM/Disassembler/Android.mk b/lib/Target/ARM/Disassembler/Android.mk
index c04f3ec..470a9fd 100644 (file)
--- a/lib/Target/ARM/Disassembler/Android.mk
+++ b/lib/Target/ARM/Disassembler/Android.mk
@@ -25,7 +25,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVM70ARMDisassembler
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/ARM/InstPrinter/Android.mk b/lib/Target/ARM/InstPrinter/Android.mk
index b860222..e0992b0 100644 (file)
--- a/lib/Target/ARM/InstPrinter/Android.mk
+++ b/lib/Target/ARM/InstPrinter/Android.mk
@@ -48,7 +48,7 @@ LOCAL_C_INCLUDES+= \
 
 LOCAL_MODULE:= libLLVM70ARMAsmPrinter
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/ARM/MCTargetDesc/Android.mk b/lib/Target/ARM/MCTargetDesc/Android.mk
index f25b025..af66304 100644 (file)
--- a/lib/Target/ARM/MCTargetDesc/Android.mk
+++ b/lib/Target/ARM/MCTargetDesc/Android.mk
@@ -57,7 +57,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 TBLGEN_TABLES := $(arm_mc_desc_TBLGEN_TABLES)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/lib/Target/ARM/TargetInfo/Android.mk b/lib/Target/ARM/TargetInfo/Android.mk
index 60cd7be..df265bb 100644 (file)
--- a/lib/Target/ARM/TargetInfo/Android.mk
+++ b/lib/Target/ARM/TargetInfo/Android.mk
@@ -48,7 +48,7 @@ LOCAL_C_INCLUDES +=   \
 
 LOCAL_MODULE:= libLLVM70ARMInfo
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Target/Android.mk b/lib/Target/Android.mk
index 24a660d..231b0f5 100644 (file)
--- a/lib/Target/Android.mk
+++ b/lib/Target/Android.mk
@@ -31,7 +31,7 @@ LOCAL_SRC_FILES := $(target_SRC_FILES)
 
 LOCAL_MODULE:= libLLVM70Target
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Target/Mips/Android.mk b/lib/Target/Mips/Android.mk
index a943997..71c1165 100644 (file)
--- a/lib/Target/Mips/Android.mk
+++ b/lib/Target/Mips/Android.mk
@@ -82,7 +82,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc
 
 TBLGEN_TABLES := $(mips_codegen_TBLGEN_TABLES)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/lib/Target/Mips/AsmParser/Android.mk b/lib/Target/Mips/AsmParser/Android.mk
index 5eb564f..0e5aa71 100644 (file)
--- a/lib/Target/Mips/AsmParser/Android.mk
+++ b/lib/Target/Mips/AsmParser/Android.mk
@@ -50,7 +50,7 @@ LOCAL_C_INCLUDES += $(mips_asm_parser_C_INCLUDES)
 TBLGEN_TABLES := $(mips_asm_parser_TBLGEN_TABLES)
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Target/Mips/Disassembler/Android.mk b/lib/Target/Mips/Disassembler/Android.mk
index 056e0dd..454a266 100644 (file)
--- a/lib/Target/Mips/Disassembler/Android.mk
+++ b/lib/Target/Mips/Disassembler/Android.mk
@@ -23,7 +23,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 TBLGEN_TABLES := $(mips_disassembler_TBLGEN_TABLES)
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/lib/Target/Mips/InstPrinter/Android.mk b/lib/Target/Mips/InstPrinter/Android.mk
index 2f3398a..1281247 100644 (file)
--- a/lib/Target/Mips/InstPrinter/Android.mk
+++ b/lib/Target/Mips/InstPrinter/Android.mk
@@ -42,7 +42,7 @@ TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 LOCAL_SRC_FILES := $(mips_asm_printer_SRC_FILES)
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Target/Mips/MCTargetDesc/Android.mk b/lib/Target/Mips/MCTargetDesc/Android.mk
index 542e91e..3d5a9a1 100644 (file)
--- a/lib/Target/Mips/MCTargetDesc/Android.mk
+++ b/lib/Target/Mips/MCTargetDesc/Android.mk
@@ -54,7 +54,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 TBLGEN_TABLES := $(mips_mc_desc_TBLGEN_TABLES)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/lib/Target/Mips/TargetInfo/Android.mk b/lib/Target/Mips/TargetInfo/Android.mk
index 7f94449..b32f5a9 100644 (file)
--- a/lib/Target/Mips/TargetInfo/Android.mk
+++ b/lib/Target/Mips/TargetInfo/Android.mk
@@ -41,7 +41,7 @@ TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 LOCAL_SRC_FILES := $(mips_target_info_SRC_FILES)
 LOCAL_C_INCLUDES +=    $(LOCAL_PATH)/..
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Target/X86/Android.mk b/lib/Target/X86/Android.mk
index 6fc773b..e926ab9 100644 (file)
--- a/lib/Target/X86/Android.mk
+++ b/lib/Target/X86/Android.mk
@@ -89,7 +89,7 @@ LOCAL_SRC_FILES := $(x86_codegen_SRC_FILES)
 
 LOCAL_MODULE:= libLLVM70X86CodeGen
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/lib/Target/X86/AsmParser/Android.mk b/lib/Target/X86/AsmParser/Android.mk
index 6eeb8c7..c4f1308 100644 (file)
--- a/lib/Target/X86/AsmParser/Android.mk
+++ b/lib/Target/X86/AsmParser/Android.mk
@@ -54,7 +54,7 @@ LOCAL_C_INCLUDES += $(x86_asm_parser_C_INCLUDES)
 TBLGEN_TABLES := $(x86_asm_parser_TBLGEN_TABLES)
 TBLGEN_TD_DIR := $(x86_asm_parser_TBLGEN_TD_DIR)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/lib/Target/X86/Disassembler/Android.mk b/lib/Target/X86/Disassembler/Android.mk
index 06d49a1..354b471 100644 (file)
--- a/lib/Target/X86/Disassembler/Android.mk
+++ b/lib/Target/X86/Disassembler/Android.mk
@@ -27,7 +27,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVM70X86Disassembler
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/X86/InstPrinter/Android.mk b/lib/Target/X86/InstPrinter/Android.mk
index 3a13e72..28251d2 100644 (file)
--- a/lib/Target/X86/InstPrinter/Android.mk
+++ b/lib/Target/X86/InstPrinter/Android.mk
@@ -28,7 +28,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVM70X86AsmPrinter
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/X86/MCTargetDesc/Android.mk b/lib/Target/X86/MCTargetDesc/Android.mk
index adbf3b4..c4ce5eb 100644 (file)
--- a/lib/Target/X86/MCTargetDesc/Android.mk
+++ b/lib/Target/X86/MCTargetDesc/Android.mk
@@ -47,7 +47,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 TBLGEN_TABLES := $(x86_mc_desc_TBLGEN_TABLES)
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Target/X86/TargetInfo/Android.mk b/lib/Target/X86/TargetInfo/Android.mk
index e1c3d6d..f59145d 100644 (file)
--- a/lib/Target/X86/TargetInfo/Android.mk
+++ b/lib/Target/X86/TargetInfo/Android.mk
@@ -47,7 +47,7 @@ LOCAL_C_INCLUDES +=     \
 
 LOCAL_MODULE:= libLLVM70X86Info
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/X86/Utils/Android.mk b/lib/Target/X86/Utils/Android.mk
index 0aaab80..c05edaf 100644 (file)
--- a/lib/Target/X86/Utils/Android.mk
+++ b/lib/Target/X86/Utils/Android.mk
@@ -14,7 +14,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVM70X86Utils
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif
 

diff --git a/lib/ToolDrivers/llvm-lib/Android.mk b/lib/ToolDrivers/llvm-lib/Android.mk
index 20677c9..e333938 100644 (file)
--- a/lib/ToolDrivers/llvm-lib/Android.mk
+++ b/lib/ToolDrivers/llvm-lib/Android.mk
@@ -34,7 +34,7 @@ TBLGEN_TABLES := $(LibDriver_TBLGEN_TABLES)
 
 LOCAL_MODULE:= libLLVM70LibDriver
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Transforms/Coroutines/Android.mk b/lib/Transforms/Coroutines/Android.mk
index 766e0f1..9b0348b 100644 (file)
--- a/lib/Transforms/Coroutines/Android.mk
+++ b/lib/Transforms/Coroutines/Android.mk
@@ -32,7 +32,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(transforms_coroutines_SRC_FILES)
 LOCAL_MODULE:= libLLVM70Coroutines
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Transforms/IPO/Android.mk b/lib/Transforms/IPO/Android.mk
index 1942db5..8d2fd02 100644 (file)
--- a/lib/Transforms/IPO/Android.mk
+++ b/lib/Transforms/IPO/Android.mk
@@ -55,7 +55,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(transforms_ipo_SRC_FILES)
 LOCAL_MODULE:= libLLVM70ipo
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Transforms/InstCombine/Android.mk b/lib/Transforms/InstCombine/Android.mk
index c318251..91057e7 100644 (file)
--- a/lib/Transforms/InstCombine/Android.mk
+++ b/lib/Transforms/InstCombine/Android.mk
@@ -37,7 +37,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(transforms_inst_combine_SRC_FILES)
 LOCAL_MODULE:= libLLVM70InstCombine
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Transforms/Instrumentation/Android.mk b/lib/Transforms/Instrumentation/Android.mk
index 9d13839..19f5434 100644 (file)
--- a/lib/Transforms/Instrumentation/Android.mk
+++ b/lib/Transforms/Instrumentation/Android.mk
@@ -36,7 +36,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE:= libLLVM70Instrumentation
 LOCAL_SRC_FILES := $(instrumentation_SRC_FILES)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Transforms/ObjCARC/Android.mk b/lib/Transforms/ObjCARC/Android.mk
index 98cc2ab..57213e8 100644 (file)
--- a/lib/Transforms/ObjCARC/Android.mk
+++ b/lib/Transforms/ObjCARC/Android.mk
@@ -33,7 +33,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(transforms_objcarc_SRC_FILES)
 LOCAL_MODULE:= libLLVM70TransformObjCARC
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Transforms/Scalar/Android.mk b/lib/Transforms/Scalar/Android.mk
index 84865f4..770c820 100644 (file)
--- a/lib/Transforms/Scalar/Android.mk
+++ b/lib/Transforms/Scalar/Android.mk
@@ -89,7 +89,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(transforms_scalar_SRC_FILES)
 LOCAL_MODULE:= libLLVM70ScalarOpts
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Transforms/Utils/Android.mk b/lib/Transforms/Utils/Android.mk
index 03ebb37..60db734 100644 (file)
--- a/lib/Transforms/Utils/Android.mk
+++ b/lib/Transforms/Utils/Android.mk
@@ -79,7 +79,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(transforms_utils_SRC_FILES)
 LOCAL_MODULE:= libLLVM70TransformUtils
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Transforms/Vectorize/Android.mk b/lib/Transforms/Vectorize/Android.mk
index d18e6d3..d515fab 100644 (file)
--- a/lib/Transforms/Vectorize/Android.mk
+++ b/lib/Transforms/Vectorize/Android.mk
@@ -28,7 +28,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(transforms_vectorize_SRC_FILES)
 LOCAL_MODULE:= libLLVM70Vectorize
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/XRay/Android.mk b/lib/XRay/Android.mk
index 2975516..bdd29cf 100644 (file)
--- a/lib/XRay/Android.mk
+++ b/lib/XRay/Android.mk
@@ -25,7 +25,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE:= libLLVM70XRay
 LOCAL_SRC_FILES := $(xray_SRC_FILES)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/llvm.mk b/llvm.mk
index 7c2514e..f79d437 100644 (file)
--- a/llvm.mk
+++ b/llvm.mk
@@ -4,7 +4,7 @@ endif
 
 CLEAR_TBLGEN_VARS := $(LLVM70_ROOT_PATH)/clear_tblgen_vars.mk
 LLVM70_HOST_BUILD_MK := $(LLVM70_ROOT_PATH)/llvm-host-build.mk
-LLVM_DEVICE_BUILD_MK := $(LLVM70_ROOT_PATH)/llvm-device-build.mk
+LLVM70_DEVICE_BUILD_MK := $(LLVM70_ROOT_PATH)/llvm-device-build.mk
 LLVM_GEN_ATTRIBUTES_MK := $(LLVM70_ROOT_PATH)/llvm-gen-attributes.mk
 LLVM_GEN_INTRINSICS_MK := $(LLVM70_ROOT_PATH)/llvm-gen-intrinsics.mk
 LLVM70_TBLGEN_RULES_MK := $(LLVM70_ROOT_PATH)/llvm-tblgen-rules.mk

diff --git a/shared_llvm.mk b/shared_llvm.mk
index f0f26df..30d2b29 100644 (file)
--- a/shared_llvm.mk
+++ b/shared_llvm.mk
@@ -160,7 +160,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += \
   $(llvm_device_static_libraries) \
   $(llvm_post_static_libraries)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(BUILD_SHARED_LIBRARY)
 
 endif

diff --git a/tools/llc/Android.mk b/tools/llc/Android.mk
index db96077..6feba44 100644 (file)
--- a/tools/llc/Android.mk
+++ b/tools/llc/Android.mk
@@ -129,7 +129,7 @@ LOCAL_STATIC_LIBRARIES_arm64 += $(llvm_llc_arm_STATIC_LIBRARIES)
 LOCAL_STATIC_LIBRARIES += $(llvm_llc_STATIC_LIBRARIES)
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_EXECUTABLE)

diff --git a/tools/llvm-link/Android.mk b/tools/llvm-link/Android.mk
index aa0bdf3..1323ab9 100644 (file)
--- a/tools/llvm-link/Android.mk
+++ b/tools/llvm-link/Android.mk
@@ -48,7 +48,7 @@ LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_SRC_FILES := $(llvm_link_SRC_FILES)
 LOCAL_STATIC_LIBRARIES := $(llvm_link_STATIC_LIBRARIES)
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(BUILD_EXECUTABLE)
 endif

diff --git a/tools/llvm-symbolizer/Android.mk b/tools/llvm-symbolizer/Android.mk
index 25e8dd9..33cea48 100644 (file)
--- a/tools/llvm-symbolizer/Android.mk
+++ b/tools/llvm-symbolizer/Android.mk
@@ -37,6 +37,6 @@ LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_SRC_FILES := $(llvm_symbolizer_SRC_FILES)
 LOCAL_SHARED_LIBRARIES := libLLVM70
 
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(BUILD_EXECUTABLE)
 endif

diff --git a/tools/opt/Android.mk b/tools/opt/Android.mk
index 57f654a..27a17b4 100644 (file)
--- a/tools/opt/Android.mk
+++ b/tools/opt/Android.mk
@@ -97,7 +97,7 @@ LOCAL_SRC_FILES := $(llvm_opt_SRC_FILES)
 LOCAL_STATIC_LIBRARIES := $(llvm_opt_STATIC_LIBRARIES)
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_EXECUTABLE)