1. Retire Ying's LOCAL_REQUIRED_MODULE change (I02184368)
2. Integrate Nick's slang_finalize change (Ib4be2a84)
3. Remove the redundant not-internalizing.
Change-Id: Ica104a12dbb14165c57e2618edab82f1c62a69ac
diff --git a/Android.mk b/Android.mk
index 6aac238..a7015cd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -10,6 +10,39 @@
include $(CLEAR_VARS)
include $(CLEAR_TBLGEN_VARS)
+LOCAL_MODULE := llvm-rs-link
+
+LOCAL_MODULE_CLASS := EXECUTABLES
+
+LOCAL_SRC_FILES := \
+ llvm-rs-link.cpp
+
+LOCAL_STATIC_LIBRARIES := \
+ libLLVMLinker \
+ libLLVMipo \
+ libLLVMBitWriter \
+ libLLVMBitReader \
+ libLLVMScalarOpts \
+ libLLVMInstCombine \
+ libLLVMTransformUtils \
+ libLLVMipa \
+ libLLVMAnalysis \
+ libLLVMTarget \
+ libLLVMCore \
+ libLLVMSupport \
+ libLLVMSystem
+
+LOCAL_LDLIBS := -ldl -lpthread
+
+include $(LLVM_HOST_BUILD_MK)
+include $(LLVM_GEN_INTRINSICS_MK)
+include $(BUILD_HOST_EXECUTABLE)
+
+# Executable for host
+# ========================================================
+include $(CLEAR_VARS)
+include $(CLEAR_TBLGEN_VARS)
+
LOCAL_MODULE := slang
LOCAL_MODULE_CLASS := EXECUTABLES
@@ -69,8 +102,6 @@
LOCAL_LDLIBS := -ldl -lpthread
-LOCAL_REQUIRED_MODULES := llvm-link
-
include $(CLANG_HOST_BUILD_MK)
include $(CLANG_TBLGEN_RULES_MK)
include $(BUILD_HOST_EXECUTABLE)