Add target build of libLLVMLinker.
Adding LOCAL_MODULE_TAGS := optional, for it to pass the tag checking.
This increase ~24KB on libbcc.so.
Change-Id: I3dcfeb3aa843d597050663752caacf7545e09ff0
diff --git a/lib/Analysis/Android.mk b/lib/Analysis/Android.mk
index 2603aa8..bd3d9fc 100644
--- a/lib/Analysis/Android.mk
+++ b/lib/Analysis/Android.mk
@@ -24,7 +24,7 @@
LibCallAliasAnalysis.cpp \
LibCallSemantics.cpp \
LiveValues.cpp \
- Loads.cpp \
+ Loads.cpp \
MemoryBuiltins.cpp \
MemoryDependenceAnalysis.cpp \
LoopDependenceAnalysis.cpp \
diff --git a/lib/Linker/Android.mk b/lib/Linker/Android.mk
index 2813000..792a675 100644
--- a/lib/Linker/Android.mk
+++ b/lib/Linker/Android.mk
@@ -1,17 +1,34 @@
LOCAL_PATH:= $(call my-dir)
+linker_SRC_FILES := \
+ LinkModules.cpp
+
# For the host
# =====================================================
include $(CLEAR_VARS)
include $(CLEAR_TBLGEN_VARS)
LOCAL_SRC_FILES := \
+ $(linker_SRC_FILES)\
LinkArchives.cpp \
Linker.cpp \
- LinkItems.cpp \
- LinkModules.cpp
+ LinkItems.cpp
-LOCAL_MODULE:= libLLVMLinker
+LOCAL_MODULE:= libLLVMLinker
+LOCAL_MODULE_TAGS := optional
include $(LLVM_HOST_BUILD_MK)
include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the device
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(linker_SRC_FILES)
+
+LOCAL_MODULE:= libLLVMLinker
+LOCAL_MODULE_TAGS := optional
+
+include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM_GEN_INTRINSICS_MK)
+include $(BUILD_STATIC_LIBRARY)