mclinker: support multilib builds
Remove the $(TARGET_ARCH) checks to support multilib builds.
Change-Id: I8f42a5d085b9f38802ee4d6b65cd3ab9d324b1c7
diff --git a/lib/Target/ARM/Android.mk b/lib/Target/ARM/Android.mk
index 525ac4e..f35d76b 100644
--- a/lib/Target/ARM/Android.mk
+++ b/lib/Target/ARM/Android.mk
@@ -30,8 +30,6 @@
# For the device
# =====================================================
-ifeq ($(TARGET_ARCH),arm)
-
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(mcld_arm_target_SRC_FILES)
@@ -42,4 +40,3 @@
include $(MCLD_DEVICE_BUILD_MK)
include $(BUILD_STATIC_LIBRARY)
-endif
diff --git a/lib/Target/ARM/TargetInfo/Android.mk b/lib/Target/ARM/TargetInfo/Android.mk
index c4fffa3..1920bb3 100644
--- a/lib/Target/ARM/TargetInfo/Android.mk
+++ b/lib/Target/ARM/TargetInfo/Android.mk
@@ -17,8 +17,6 @@
# For the device
# =====================================================
-ifeq ($(TARGET_ARCH),arm)
-
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(mcld_arm_info_SRC_FILES)
@@ -28,5 +26,3 @@
include $(MCLD_DEVICE_BUILD_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/Target/Mips/Android.mk b/lib/Target/Mips/Android.mk
index 2410f6f..4c921ca 100644
--- a/lib/Target/Mips/Android.mk
+++ b/lib/Target/Mips/Android.mk
@@ -25,8 +25,6 @@
# For the device
# =====================================================
-ifeq ($(TARGET_ARCH),mips)
-
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(mcld_mips_target_SRC_FILES)
@@ -37,4 +35,3 @@
include $(MCLD_DEVICE_BUILD_MK)
include $(BUILD_STATIC_LIBRARY)
-endif
diff --git a/lib/Target/Mips/TargetInfo/Android.mk b/lib/Target/Mips/TargetInfo/Android.mk
index cf8ae38..5a92217 100644
--- a/lib/Target/Mips/TargetInfo/Android.mk
+++ b/lib/Target/Mips/TargetInfo/Android.mk
@@ -17,8 +17,6 @@
# For the device
# =====================================================
-ifeq ($(TARGET_ARCH),mips)
-
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(mcld_mips_info_SRC_FILES)
@@ -28,5 +26,3 @@
include $(MCLD_DEVICE_BUILD_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/Target/X86/Android.mk b/lib/Target/X86/Android.mk
index 94b2f0f..77b7258 100644
--- a/lib/Target/X86/Android.mk
+++ b/lib/Target/X86/Android.mk
@@ -27,8 +27,6 @@
# For the device
# =====================================================
-ifeq ($(TARGET_ARCH),x86)
-
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(mcld_x86_target_SRC_FILES)
@@ -38,5 +36,3 @@
include $(MCLD_DEVICE_BUILD_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/Target/X86/TargetInfo/Android.mk b/lib/Target/X86/TargetInfo/Android.mk
index 3664933..d520580 100644
--- a/lib/Target/X86/TargetInfo/Android.mk
+++ b/lib/Target/X86/TargetInfo/Android.mk
@@ -17,8 +17,6 @@
# For the device
# =====================================================
-ifeq ($(TARGET_ARCH),x86)
-
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(mcld_x86_info_SRC_FILES)
@@ -28,5 +26,3 @@
include $(MCLD_DEVICE_BUILD_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif