diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-03 17:54:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-03 17:54:45 +0000 |
| commit | 4de5ad4388bab02661c00437e7cf6b463b705ca9 (patch) | |
| tree | 25094b0749e6f2939e405c226c63eb522090554a | |
| parent | 8a68239100bc9f6f30ab1fcb0108085a636b7486 (diff) | |
| parent | 0d8024950adc786e7d360261de0effe0ddd236d0 (diff) | |
| download | external_llvm-4de5ad4388bab02661c00437e7cf6b463b705ca9.zip external_llvm-4de5ad4388bab02661c00437e7cf6b463b705ca9.tar.gz external_llvm-4de5ad4388bab02661c00437e7cf6b463b705ca9.tar.bz2 | |
am 0d802495: Merge "Allow mm in these subdirectories."
* commit '0d8024950adc786e7d360261de0effe0ddd236d0':
Allow mm in these subdirectories.
| -rw-r--r-- | lib/Support/Android.mk | 2 | ||||
| -rw-r--r-- | lib/TableGen/Android.mk | 3 | ||||
| -rw-r--r-- | utils/TableGen/Android.mk | 5 |
3 files changed, 9 insertions, 1 deletions
diff --git a/lib/Support/Android.mk b/lib/Support/Android.mk index 5dba8d8..7968697 100644 --- a/lib/Support/Android.mk +++ b/lib/Support/Android.mk @@ -1,4 +1,6 @@ LOCAL_PATH:= $(call my-dir) +LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. +include $(LLVM_ROOT_PATH)/llvm.mk support_SRC_FILES := \ Allocator.cpp \ diff --git a/lib/TableGen/Android.mk b/lib/TableGen/Android.mk index 0fd94bb..0484f90 100644 --- a/lib/TableGen/Android.mk +++ b/lib/TableGen/Android.mk @@ -1,4 +1,6 @@ LOCAL_PATH:= $(call my-dir) +LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. +include $(LLVM_ROOT_PATH)/llvm.mk libtablegen_SRC_FILES := \ Error.cpp \ @@ -13,6 +15,7 @@ libtablegen_SRC_FILES := \ # For the host # ===================================================== include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_SRC_FILES := $(libtablegen_SRC_FILES) LOCAL_MODULE:= libLLVMTableGen diff --git a/utils/TableGen/Android.mk b/utils/TableGen/Android.mk index a743950..48cc425 100644 --- a/utils/TableGen/Android.mk +++ b/utils/TableGen/Android.mk @@ -1,4 +1,6 @@ -LOCAL_PATH:= $(call my-dir) +LOCAL_PATH := $(call my-dir) +LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. +include $(LLVM_ROOT_PATH)/llvm.mk tablegen_SRC_FILES := \ AsmMatcherEmitter.cpp \ @@ -34,6 +36,7 @@ tablegen_SRC_FILES := \ X86RecognizableInstr.cpp include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE := llvm-tblgen LOCAL_MODULE_TAGS := optional |