android: additional build fixes

diff --git a/lib/ExecutionEngine/RuntimeDyld/Android.mk b/lib/ExecutionEngine/RuntimeDyld/Android.mk
index 075b433..3d13d48 100644 (file)
--- a/lib/ExecutionEngine/RuntimeDyld/Android.mk
+++ b/lib/ExecutionEngine/RuntimeDyld/Android.mk
@@ -20,6 +20,8 @@ LOCAL_MODULE := libLLVM70RuntimeDyld
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -31,5 +33,7 @@ LOCAL_SRC_FILES := $(runtimedyld_SRC_FILES)
 LOCAL_MODULE := libLLVM70RuntimeDyld
 
 include $(LLVM70_DEVICE_BUILD_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/utils/TableGen/Android.mk b/utils/TableGen/Android.mk
index e91202c..16dd86c 100644 (file)
--- a/utils/TableGen/Android.mk
+++ b/utils/TableGen/Android.mk
@@ -23,6 +23,7 @@ tablegen_SRC_FILES := \
   DAGISelMatcher.cpp \
   DFAPacketizerEmitter.cpp \
   DisassemblerEmitter.cpp \
+  ExegesisEmitter.cpp \
   FastISelEmitter.cpp \
   FixedLenDecoderEmitter.cpp \
   GlobalISelEmitter.cpp \