am b7485134: am 449fc261: Merge "llvm: convert makefiles to support multilib build"

* commit 'b7485134a2cbecc47904988b4cfde24019ac4fa1':
  llvm: convert makefiles to support multilib build

diff --cc lib/Target/Mips/Android.mk
Simple merge

diff --cc lib/Target/Mips/MCTargetDesc/Android.mk
Simple merge

diff --cc lib/Transforms/Scalar/Android.mk
Simple merge

diff --cc llvm.mk
Simple merge

diff --cc shared_llvm.mk
index 797a9b8,14c60b9..3f9e104
--- 1/shared_llvm.mk
--- 2/shared_llvm.mk
+++ b/shared_llvm.mk
@@@ -89,11 -80,11 +89,12 @@@ endi
  
  include $(LLVM_HOST_BUILD_MK)
  include $(BUILD_HOST_SHARED_LIBRARY)
 +endif
  
- #TODOArm64: Enable llvm build
- #TODOMips64: Enable llvm build
- ifeq ($(filter $(TARGET_ARCH),arm64 mips64),)
+ ifeq (,$(filter $(TARGET_ARCH),$(LLVM_SUPPORTED_ARCH)))
+ $(warning TODO $(TARGET_ARCH): Enable llvm build)
+ endif
+ 
  # DEVICE LLVM shared library build
  include $(CLEAR_VARS)