LLVM_ROOT_PATH to LLVM70_ROOT_PATH

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

Change-Id: Ie102b63dbd4200d923a398d57d05f6e56b1e970b

diff --git a/Android.mk b/Android.mk
index 0273ab0..0ac5144 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,5 @@
 LOCAL_PATH := $(call my-dir)
-LLVM_ROOT_PATH := $(LOCAL_PATH)
+LLVM70_ROOT_PATH := $(LOCAL_PATH)
 LLVM_TBLGEN := $(HOST_OUT_EXECUTABLES)/llvm70-tblgen
 
 FORCE_BUILD_LLVM_DISABLE_NDEBUG ?= false

diff --git a/lib/IR/llvm-gen-local.mk b/lib/IR/llvm-gen-local.mk
index 91927ee..a594823 100644 (file)
--- a/lib/IR/llvm-gen-local.mk
+++ b/lib/IR/llvm-gen-local.mk
@@ -1,4 +1,4 @@
-ATTRIBUTETD_LOCAL := $(LLVM_ROOT_PATH)/lib/IR/AttributesCompatFunc.td
+ATTRIBUTETD_LOCAL := $(LLVM70_ROOT_PATH)/lib/IR/AttributesCompatFunc.td
 
 GENFILE_LOCAL := $(addprefix $(call local-generated-sources-dir)/,AttributesCompatFunc.inc)
 LOCAL_GENERATED_SOURCES += $(GENFILE_LOCAL)

diff --git a/lib/Support/Android.mk b/lib/Support/Android.mk
index 71d3f35..502b5c2 100644 (file)
--- a/lib/Support/Android.mk
+++ b/lib/Support/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH:= $(call my-dir)
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
-include $(LLVM_ROOT_PATH)/llvm.mk
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+include $(LLVM70_ROOT_PATH)/llvm.mk
 
 support_SRC_FILES := \
   AMDGPUCodeObjectMetadata.cpp \

diff --git a/lib/TableGen/Android.mk b/lib/TableGen/Android.mk
index 8316a3c..6f51653 100644 (file)
--- a/lib/TableGen/Android.mk
+++ b/lib/TableGen/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH:= $(call my-dir)
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
-include $(LLVM_ROOT_PATH)/llvm.mk
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+include $(LLVM70_ROOT_PATH)/llvm.mk
 
 libtablegen_SRC_FILES := \
   Error.cpp \

diff --git a/lib/Transforms/Hello/Android.mk b/lib/Transforms/Hello/Android.mk
index a8f458a..6d1920d 100644 (file)
--- a/lib/Transforms/Hello/Android.mk
+++ b/lib/Transforms/Hello/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH:= $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../../..
-include $(LLVM_ROOT_PATH)/llvm.mk
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../../..
+include $(LLVM70_ROOT_PATH)/llvm.mk
 
 transforms_hello_SRC_FILES := \
   Hello.cpp

diff --git a/llvm-device-build.mk b/llvm-device-build.mk
index 2f4109c..831a931 100644 (file)
--- a/llvm-device-build.mk
+++ b/llvm-device-build.mk
@@ -64,9 +64,9 @@ LOCAL_CPPFLAGS :=     \
 # Make sure bionic is first so we can include system headers.
 LOCAL_C_INCLUDES :=    \
        bionic \
-       $(LLVM_ROOT_PATH)       \
-       $(LLVM_ROOT_PATH)/include       \
-       $(LLVM_ROOT_PATH)/device/include        \
+       $(LLVM70_ROOT_PATH)     \
+       $(LLVM70_ROOT_PATH)/include     \
+       $(LLVM70_ROOT_PATH)/device/include      \
        $(LOCAL_C_INCLUDES)
 
 ###########################################################
@@ -77,9 +77,9 @@ define transform-device-td-to-out
 @echo "Device TableGen (gen-$(1)): $(TBLGEN_LOCAL_MODULE) <= $<"
 $(hide) $(LLVM_TBLGEN) \
        -I $(dir $<)    \
-       -I $(LLVM_ROOT_PATH)/include    \
-       -I $(LLVM_ROOT_PATH)/device/include     \
-       -I $(LLVM_ROOT_PATH)/lib/Target \
+       -I $(LLVM70_ROOT_PATH)/include  \
+       -I $(LLVM70_ROOT_PATH)/device/include   \
+       -I $(LLVM70_ROOT_PATH)/lib/Target       \
     -gen-$(strip $(1)) \
     -o $@ $<
 endef

diff --git a/llvm-gen-attributes.mk b/llvm-gen-attributes.mk
index 555366b..fdd7797 100644 (file)
--- a/llvm-gen-attributes.mk
+++ b/llvm-gen-attributes.mk
@@ -1,4 +1,4 @@
-ATTRIBUTETD := $(LLVM_ROOT_PATH)/include/llvm/IR/Attributes.td
+ATTRIBUTETD := $(LLVM70_ROOT_PATH)/include/llvm/IR/Attributes.td
 
 ifeq ($(LOCAL_MODULE_CLASS),)
        LOCAL_MODULE_CLASS := STATIC_LIBRARIES

diff --git a/llvm-gen-intrinsics.mk b/llvm-gen-intrinsics.mk
index d770596..3a73475 100644 (file)
--- a/llvm-gen-intrinsics.mk
+++ b/llvm-gen-intrinsics.mk
@@ -1,5 +1,5 @@
 # We treat Intrinsics.td as a very special target just like what lib/VMCore/Makefile does
-INTRINSICTD := $(LLVM_ROOT_PATH)/include/llvm/IR/Intrinsics.td
+INTRINSICTD := $(LLVM70_ROOT_PATH)/include/llvm/IR/Intrinsics.td
 INTRINSICTDS := $(wildcard $(dir $(INTRINSICTD))/Intrinsics*.td)
 
 ifeq ($(LOCAL_MODULE_CLASS),)

diff --git a/llvm-host-build.mk b/llvm-host-build.mk
index 39300e0..be9b9c8 100644 (file)
--- a/llvm-host-build.mk
+++ b/llvm-host-build.mk
@@ -65,9 +65,9 @@ LOCAL_CPPFLAGS_darwin += \
 
 # Make sure bionic is first so we can include system headers.
 LOCAL_C_INCLUDES :=    \
-       $(LLVM_ROOT_PATH)       \
-       $(LLVM_ROOT_PATH)/include       \
-       $(LLVM_ROOT_PATH)/host/include  \
+       $(LLVM70_ROOT_PATH)     \
+       $(LLVM70_ROOT_PATH)/include     \
+       $(LLVM70_ROOT_PATH)/host/include        \
        $(LOCAL_C_INCLUDES)
 
 # Add on ncurses to have support for terminfo
@@ -94,9 +94,9 @@ define transform-host-td-to-out
 @echo "Host TableGen: $(TBLGEN_LOCAL_MODULE) (gen-$(1)) <= $<"
 $(hide) $(LLVM_TBLGEN) \
        -I $(dir $<)    \
-       -I $(LLVM_ROOT_PATH)/include    \
-       -I $(LLVM_ROOT_PATH)/host/include       \
-       -I $(LLVM_ROOT_PATH)/lib/Target \
+       -I $(LLVM70_ROOT_PATH)/include  \
+       -I $(LLVM70_ROOT_PATH)/host/include     \
+       -I $(LLVM70_ROOT_PATH)/lib/Target       \
        $(if $(strip $(CLANG_ROOT_PATH)),-I $(CLANG_ROOT_PATH)/include,)        \
        -gen-$(strip $(1))      \
        -o $@ $<

diff --git a/llvm-tblgen-rules.mk b/llvm-tblgen-rules.mk
index 40fa9c6..6c5cfd6 100644 (file)
--- a/llvm-tblgen-rules.mk
+++ b/llvm-tblgen-rules.mk
@@ -38,7 +38,7 @@ tblgen_td_deps := $(wildcard $(tblgen_td_deps))
 #
 # The directory and the .td directory is not the same.
 #
-ifeq ($(tblgen_source_dir),$(LLVM_ROOT_PATH)/lib/Target/ARM/MCTargetDesc)
+ifeq ($(tblgen_source_dir),$(LLVM70_ROOT_PATH)/lib/Target/ARM/MCTargetDesc)
 $(generated_sources)/%GenRegisterInfo.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenRegisterInfo.inc: $(tblgen_source_dir)/../%.td \
                                        $(tblgen_td_deps) $(LLVM_TBLGEN)
@@ -55,7 +55,7 @@ $(generated_sources)/%GenSubtargetInfo.inc: $(tblgen_source_dir)/../%.td \
        $(call transform-td-to-out,subtarget)
 endif
 
-ifeq ($(tblgen_source_dir),$(LLVM_ROOT_PATH)/lib/Target/X86/MCTargetDesc)
+ifeq ($(tblgen_source_dir),$(LLVM70_ROOT_PATH)/lib/Target/X86/MCTargetDesc)
 $(generated_sources)/%GenRegisterInfo.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenRegisterInfo.inc: $(tblgen_source_dir)/../%.td \
                                        $(tblgen_td_deps) $(LLVM_TBLGEN)
@@ -72,7 +72,7 @@ $(generated_sources)/%GenSubtargetInfo.inc: $(tblgen_source_dir)/../%.td \
        $(call transform-td-to-out,subtarget)
 endif
 
-ifeq ($(tblgen_source_dir),$(LLVM_ROOT_PATH)/lib/Target/Mips/MCTargetDesc)
+ifeq ($(tblgen_source_dir),$(LLVM70_ROOT_PATH)/lib/Target/Mips/MCTargetDesc)
 $(generated_sources)/%GenRegisterInfo.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenRegisterInfo.inc: $(tblgen_source_dir)/../%.td \
                                        $(tblgen_td_deps) $(LLVM_TBLGEN)
@@ -235,7 +235,7 @@ $(generated_sources)/Options.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/Options.inc: $(tblgen_source_dir)/Options.td \
                                      $(tblgen_td_deps) \
                                      $(LLVM_TBLGEN) \
-                                     $(LLVM_ROOT_PATH)/include/llvm/Option/OptParser.td
+                                     $(LLVM70_ROOT_PATH)/include/llvm/Option/OptParser.td
        $(call transform-td-to-out,opt-parser-defs)
 endif
 

diff --git a/llvm.mk b/llvm.mk
index ec7ae81..b501f2f 100644 (file)
--- a/llvm.mk
+++ b/llvm.mk
@@ -1,12 +1,12 @@
-ifeq ($(LLVM_ROOT_PATH),)
-$(error Must set variable LLVM_ROOT_PATH before including this! $(LOCAL_PATH))
+ifeq ($(LLVM70_ROOT_PATH),)
+$(error Must set variable LLVM70_ROOT_PATH before including this! $(LOCAL_PATH))
 endif
 
-CLEAR_TBLGEN_VARS := $(LLVM_ROOT_PATH)/clear_tblgen_vars.mk
-LLVM_HOST_BUILD_MK := $(LLVM_ROOT_PATH)/llvm-host-build.mk
-LLVM_DEVICE_BUILD_MK := $(LLVM_ROOT_PATH)/llvm-device-build.mk
-LLVM_GEN_ATTRIBUTES_MK := $(LLVM_ROOT_PATH)/llvm-gen-attributes.mk
-LLVM_GEN_INTRINSICS_MK := $(LLVM_ROOT_PATH)/llvm-gen-intrinsics.mk
-LLVM_TBLGEN_RULES_MK := $(LLVM_ROOT_PATH)/llvm-tblgen-rules.mk
+CLEAR_TBLGEN_VARS := $(LLVM70_ROOT_PATH)/clear_tblgen_vars.mk
+LLVM_HOST_BUILD_MK := $(LLVM70_ROOT_PATH)/llvm-host-build.mk
+LLVM_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
+LLVM_TBLGEN_RULES_MK := $(LLVM70_ROOT_PATH)/llvm-tblgen-rules.mk
 
 LLVM_SUPPORTED_ARCH := arm arm64 mips mips64 x86 x86_64

diff --git a/tools/bugpoint-passes/Android.mk b/tools/bugpoint-passes/Android.mk
index b82bcb2..02add62 100644 (file)
--- a/tools/bugpoint-passes/Android.mk
+++ b/tools/bugpoint-passes/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
-include $(LLVM_ROOT_PATH)/llvm.mk
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+include $(LLVM70_ROOT_PATH)/llvm.mk
 
 bugpoint_passes_SRC_FILES := \
   TestPasses.cpp

diff --git a/tools/bugpoint/Android.mk b/tools/bugpoint/Android.mk
index 2ac6e66..1ea08dc 100644 (file)
--- a/tools/bugpoint/Android.mk
+++ b/tools/bugpoint/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -55,7 +55,7 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 LOCAL_LDFLAGS_darwin := -Wl,-export_dynamic
 LOCAL_LDFLAGS_linux := -Wl,--export-dynamic
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/tools/dsymutil/Android.mk b/tools/dsymutil/Android.mk
index 9c522d2..77dec94 100644 (file)
--- a/tools/dsymutil/Android.mk
+++ b/tools/dsymutil/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
-include $(LLVM_ROOT_PATH)/llvm.mk
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+include $(LLVM70_ROOT_PATH)/llvm.mk
 
 llvm_dsymutil_SRC_FILES := \
   BinaryHolder.cpp \

diff --git a/tools/gold/Android.mk b/tools/gold/Android.mk
index 2c792a2..b79d820 100644 (file)
--- a/tools/gold/Android.mk
+++ b/tools/gold/Android.mk
@@ -16,8 +16,8 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../../
-include $(LLVM_ROOT_PATH)/llvm.mk
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../../
+include $(LLVM70_ROOT_PATH)/llvm.mk
 
 # For the host only
 # =====================================================

diff --git a/tools/llc/Android.mk b/tools/llc/Android.mk
index 22f8e63..5af3a2e 100644 (file)
--- a/tools/llc/Android.mk
+++ b/tools/llc/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -93,7 +93,7 @@ LOCAL_STATIC_LIBRARIES := \
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
@@ -128,7 +128,7 @@ LOCAL_STATIC_LIBRARIES_arm64 += $(llvm_llc_arm_STATIC_LIBRARIES)
 
 LOCAL_STATIC_LIBRARIES += $(llvm_llc_STATIC_LIBRARIES)
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/tools/lli/Android.mk b/tools/lli/Android.mk
index 3da7023..a24c972 100644 (file)
--- a/tools/lli/Android.mk
+++ b/tools/lli/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -79,7 +79,7 @@ LOCAL_STATIC_LIBRARIES := $(lli_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/tools/lli/ChildTarget/Android.mk b/tools/lli/ChildTarget/Android.mk
index 47ff52c..86f8d12 100644 (file)
--- a/tools/lli/ChildTarget/Android.mk
+++ b/tools/lli/ChildTarget/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../../../
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../../../
 
 
 #===---------------------------------------------------------------===
@@ -25,7 +25,7 @@ LOCAL_STATIC_LIBRARIES := \
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-ar/Android.mk b/tools/llvm-ar/Android.mk
index a59ce6b..42a3e02 100644 (file)
--- a/tools/llvm-ar/Android.mk
+++ b/tools/llvm-ar/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -28,7 +28,7 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 LOCAL_POST_INSTALL_CMD = $(hide) ln -sf llvm-ar $(dir $(LOCAL_INSTALLED_MODULE))llvm-lib \
                                                 && ln -sf llvm-ar $(dir $(LOCAL_INSTALLED_MODULE))llvm-ranlib
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-bcanalyzer/Android.mk b/tools/llvm-bcanalyzer/Android.mk
index 6a217d3..69993a7 100644 (file)
--- a/tools/llvm-bcanalyzer/Android.mk
+++ b/tools/llvm-bcanalyzer/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -29,7 +29,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_bcanalyzer_STATIC_LIBRARIES)
 LOCAL_LDLIBS += -lpthread -lm -ldl
 LOCAL_C_INCLUDES += external/llvm/include
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/tools/llvm-c-test/Android.mk b/tools/llvm-c-test/Android.mk
index 0f123bd..151d0b1 100644 (file)
--- a/tools/llvm-c-test/Android.mk
+++ b/tools/llvm-c-test/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -72,7 +72,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_c_test_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-config/Android.mk b/tools/llvm-config/Android.mk
index df51d87..6455be1 100644 (file)
--- a/tools/llvm-config/Android.mk
+++ b/tools/llvm-config/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 #===---------------------------------------------------------------===
 # llvm-config command line tool
@@ -44,6 +44,6 @@ LOCAL_ADDITIONAL_DEPENDENCIES := \
   $(LOCAL_PATH)/Android.mk \
   $(LOCAL_GENERATED_SOURCES)
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-cov/Android.mk b/tools/llvm-cov/Android.mk
index fd2d013..d6a3e61 100644 (file)
--- a/tools/llvm-cov/Android.mk
+++ b/tools/llvm-cov/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -39,7 +39,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_cov_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-cxxdump/Android.mk b/tools/llvm-cxxdump/Android.mk
index f613b4a..c8d3664 100644 (file)
--- a/tools/llvm-cxxdump/Android.mk
+++ b/tools/llvm-cxxdump/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
-include $(LLVM_ROOT_PATH)/llvm.mk
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+include $(LLVM70_ROOT_PATH)/llvm.mk
 
 llvm_cxxdump_SRC_FILES := \
   Error.cpp \

diff --git a/tools/llvm-diff/Android.mk b/tools/llvm-diff/Android.mk
index f62e18c..a883608 100644 (file)
--- a/tools/llvm-diff/Android.mk
+++ b/tools/llvm-diff/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -33,7 +33,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_diff_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/tools/llvm-dwarfdump/Android.mk b/tools/llvm-dwarfdump/Android.mk
index 322e9b1..fc1efa1 100644 (file)
--- a/tools/llvm-dwarfdump/Android.mk
+++ b/tools/llvm-dwarfdump/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -33,7 +33,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_dwarfdump_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-dwp/Android.mk b/tools/llvm-dwp/Android.mk
index 531b531..ffa5b75 100644 (file)
--- a/tools/llvm-dwp/Android.mk
+++ b/tools/llvm-dwp/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -79,7 +79,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_dwp_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-extract/Android.mk b/tools/llvm-extract/Android.mk
index d0a9169..3f634c3 100644 (file)
--- a/tools/llvm-extract/Android.mk
+++ b/tools/llvm-extract/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -36,7 +36,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_extract_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/tools/llvm-lto/Android.mk b/tools/llvm-lto/Android.mk
index 80a2431..94fc7cf 100644 (file)
--- a/tools/llvm-lto/Android.mk
+++ b/tools/llvm-lto/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -76,7 +76,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_lto_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/tools/llvm-mc/Android.mk b/tools/llvm-mc/Android.mk
index b18ce18..923168c 100644 (file)
--- a/tools/llvm-mc/Android.mk
+++ b/tools/llvm-mc/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -62,7 +62,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_mc_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-mcmarkup/Android.mk b/tools/llvm-mcmarkup/Android.mk
index d07199e..4c9f454 100644 (file)
--- a/tools/llvm-mcmarkup/Android.mk
+++ b/tools/llvm-mcmarkup/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -27,7 +27,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_mcmarkup_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-nm/Android.mk b/tools/llvm-nm/Android.mk
index 9340f48..4379442 100644 (file)
--- a/tools/llvm-nm/Android.mk
+++ b/tools/llvm-nm/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -62,7 +62,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_nm_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/tools/llvm-objdump/Android.mk b/tools/llvm-objdump/Android.mk
index daccba3..0336e20 100644 (file)
--- a/tools/llvm-objdump/Android.mk
+++ b/tools/llvm-objdump/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -66,7 +66,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_objdump_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-profdata/Android.mk b/tools/llvm-profdata/Android.mk
index 5f21658..04af454 100644 (file)
--- a/tools/llvm-profdata/Android.mk
+++ b/tools/llvm-profdata/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -29,7 +29,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_profdata_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/tools/llvm-readobj/Android.mk b/tools/llvm-readobj/Android.mk
index efbf4e4..4940692 100644 (file)
--- a/tools/llvm-readobj/Android.mk
+++ b/tools/llvm-readobj/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -45,7 +45,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_readobj_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-rtdyld/Android.mk b/tools/llvm-rtdyld/Android.mk
index fc90cf0..e78f51d 100644 (file)
--- a/tools/llvm-rtdyld/Android.mk
+++ b/tools/llvm-rtdyld/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -63,7 +63,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_rtdyld_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-size/Android.mk b/tools/llvm-size/Android.mk
index 39e8f75..94daf89 100644 (file)
--- a/tools/llvm-size/Android.mk
+++ b/tools/llvm-size/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -31,7 +31,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_size_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-symbolizer/Android.mk b/tools/llvm-symbolizer/Android.mk
index 336dade..f7dcd22 100644 (file)
--- a/tools/llvm-symbolizer/Android.mk
+++ b/tools/llvm-symbolizer/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
-include $(LLVM_ROOT_PATH)/llvm.mk
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+include $(LLVM70_ROOT_PATH)/llvm.mk
 
 llvm_symbolizer_SRC_FILES := \
   llvm-symbolizer.cpp

diff --git a/tools/lto/Android.mk b/tools/lto/Android.mk
index c559666..b4ab4c6 100644 (file)
--- a/tools/lto/Android.mk
+++ b/tools/lto/Android.mk
@@ -16,8 +16,8 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../../
-include $(LLVM_ROOT_PATH)/llvm.mk
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../../
+include $(LLVM70_ROOT_PATH)/llvm.mk
 
 # For the host only
 # =====================================================

diff --git a/tools/obj2yaml/Android.mk b/tools/obj2yaml/Android.mk
index c3c11c4..c575e9a 100644 (file)
--- a/tools/obj2yaml/Android.mk
+++ b/tools/obj2yaml/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -34,7 +34,7 @@ LOCAL_STATIC_LIBRARIES := $(obj2yaml_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/opt/Android.mk b/tools/opt/Android.mk
index fd4c211..614dc62 100644 (file)
--- a/tools/opt/Android.mk
+++ b/tools/opt/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -79,7 +79,7 @@ LOCAL_LDLIBS += -lpthread -ldl
 LOCAL_LDFLAGS_darwin := -Wl,-export_dynamic
 LOCAL_LDFLAGS_linux := -Wl,--export-dynamic
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
@@ -96,7 +96,7 @@ LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_SRC_FILES := $(llvm_opt_SRC_FILES)
 LOCAL_STATIC_LIBRARIES := $(llvm_opt_STATIC_LIBRARIES)
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/tools/sancov/Android.mk b/tools/sancov/Android.mk
index c333009..4cf3f00 100644 (file)
--- a/tools/sancov/Android.mk
+++ b/tools/sancov/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -71,6 +71,6 @@ LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := $(llvm_sancov_SRC_FILES)
 LOCAL_STATIC_LIBRARIES := $(llvm_sancov_STATIC_LIBRARIES)
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/verify-uselistorder/Android.mk b/tools/verify-uselistorder/Android.mk
index a536fb8..95e55bb 100644 (file)
--- a/tools/verify-uselistorder/Android.mk
+++ b/tools/verify-uselistorder/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
-include $(LLVM_ROOT_PATH)/llvm.mk
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+include $(LLVM70_ROOT_PATH)/llvm.mk
 
 verify_uselistorder_SRC_FILES := \
   verify-uselistorder.cpp

diff --git a/tools/yaml2obj/Android.mk b/tools/yaml2obj/Android.mk
index c2dec28..acffee4 100644 (file)
--- a/tools/yaml2obj/Android.mk
+++ b/tools/yaml2obj/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -33,7 +33,7 @@ LOCAL_STATIC_LIBRARIES := $(yaml2obj_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/utils/TableGen/Android.mk b/utils/TableGen/Android.mk
index b09dea7..dbd770d 100644 (file)
--- a/utils/TableGen/Android.mk
+++ b/utils/TableGen/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
-include $(LLVM_ROOT_PATH)/llvm.mk
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+include $(LLVM70_ROOT_PATH)/llvm.mk
 
 tablegen_SRC_FILES := \
   AsmMatcherEmitter.cpp \

diff --git a/utils/count/Android.mk b/utils/count/Android.mk
index 1ee8271..c4a2c05 100644 (file)
--- a/utils/count/Android.mk
+++ b/utils/count/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -21,6 +21,6 @@ LOCAL_SRC_FILES := $(count_SRC_FILES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/utils/not/Android.mk b/utils/not/Android.mk
index 5f06c52..e4a6017 100644 (file)
--- a/utils/not/Android.mk
+++ b/utils/not/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -27,6 +27,6 @@ LOCAL_STATIC_LIBRARIES := $(not_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/utils/yaml-bench/Android.mk b/utils/yaml-bench/Android.mk
index 536fdef..99aaae3 100644 (file)
--- a/utils/yaml-bench/Android.mk
+++ b/utils/yaml-bench/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 yaml_bench_SRC_FILES := \
@@ -23,6 +23,6 @@ LOCAL_SRC_FILES := $(yaml_bench_SRC_FILES)
 
 LOCAL_STATIC_LIBRARIES := $(yaml_bench_STATIC_LIBRARIES)
 
-include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_EXECUTABLE)