diff options
| author | Colin Cross <ccross@android.com> | 2014-02-18 23:54:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-18 23:54:44 +0000 |
| commit | bd3e4ce9cfa61bcc0176ac17a06f0904cb854a9a (patch) | |
| tree | 361a9c638bf0785a9198793b8bb744ce9f9b81cf /lib/Target/ARM/TargetInfo/Android.mk | |
| parent | cfe73f379d20f50874bc523fab59c2db43388a32 (diff) | |
| parent | b7485134a2cbecc47904988b4cfde24019ac4fa1 (diff) | |
| download | external_llvm-bd3e4ce9cfa61bcc0176ac17a06f0904cb854a9a.zip external_llvm-bd3e4ce9cfa61bcc0176ac17a06f0904cb854a9a.tar.gz external_llvm-bd3e4ce9cfa61bcc0176ac17a06f0904cb854a9a.tar.bz2 | |
am b7485134: am 449fc261: Merge "llvm: convert makefiles to support multilib build"
* commit 'b7485134a2cbecc47904988b4cfde24019ac4fa1':
llvm: convert makefiles to support multilib build
Diffstat (limited to 'lib/Target/ARM/TargetInfo/Android.mk')
| -rw-r--r-- | lib/Target/ARM/TargetInfo/Android.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/Target/ARM/TargetInfo/Android.mk b/lib/Target/ARM/TargetInfo/Android.mk index d1af6ae..de4416e 100644 --- a/lib/Target/ARM/TargetInfo/Android.mk +++ b/lib/Target/ARM/TargetInfo/Android.mk @@ -32,7 +32,6 @@ include $(BUILD_HOST_STATIC_LIBRARY) # For the device # ===================================================== -ifeq ($(TARGET_ARCH),arm) include $(CLEAR_VARS) include $(CLEAR_TBLGEN_VARS) @@ -52,4 +51,3 @@ LOCAL_MODULE_TAGS := optional include $(LLVM_DEVICE_BUILD_MK) include $(LLVM_TBLGEN_RULES_MK) include $(BUILD_STATIC_LIBRARY) -endif |