am dad1eeca: Merge "Only the host part of the elfutils build should be conditional."
* commit 'dad1eecaf9bcc826dacdf2855b7bd1adddd02a59':
Only the host part of the elfutils build should be conditional.
diff --git a/0.153/libdw/Android.mk b/0.153/libdw/Android.mk
index f9c02af..52a0923 100755
--- a/0.153/libdw/Android.mk
+++ b/0.153/libdw/Android.mk
@@ -14,17 +14,6 @@
LOCAL_PATH := $(call my-dir)
-supported_platforms := linux
-cur_platform := $(filter $(HOST_OS),$(supported_platforms))
-
-ifdef cur_platform
-
-#
-# host libdw
-#
-
-include $(CLEAR_VARS)
-
LIBDW_SRC_FILES := \
cfi.c \
cie.c \
@@ -127,6 +116,14 @@
libdw_visit_scopes.c \
memory-access.c
+ifeq ($(HOST_OS),linux)
+
+#
+# host libdw
+#
+
+include $(CLEAR_VARS)
+
LOCAL_SRC_FILES := $(LIBDW_SRC_FILES)
LOCAL_C_INCLUDES := \
@@ -152,6 +149,8 @@
include $(BUILD_HOST_STATIC_LIBRARY)
+endif # linux
+
#
# target libdw
#
@@ -180,5 +179,3 @@
LOCAL_MODULE:= libdw
include $(BUILD_STATIC_LIBRARY)
-
-endif #cur_platform
diff --git a/0.153/libdwfl/Android.mk b/0.153/libdwfl/Android.mk
index 46f3b38..6d28384 100755
--- a/0.153/libdwfl/Android.mk
+++ b/0.153/libdwfl/Android.mk
@@ -14,17 +14,6 @@
LOCAL_PATH := $(call my-dir)
-supported_platforms := linux
-cur_platform := $(filter $(HOST_OS),$(supported_platforms))
-
-ifdef cur_platform
-
-#
-# host libdwfl
-#
-
-include $(CLEAR_VARS)
-
LIBDWFL_SRC_FILES := \
dwfl_addrdwarf.c \
dwfl_addrmodule.c \
@@ -51,6 +40,14 @@
relocate.c \
segment.c \
+ifeq ($(HOST_OS),linux)
+
+#
+# host libdwfl
+#
+
+include $(CLEAR_VARS)
+
LOCAL_SRC_FILES := $(LIBDWFL_SRC_FILES)
LOCAL_C_INCLUDES := \
@@ -78,6 +75,8 @@
include $(BUILD_HOST_STATIC_LIBRARY)
+endif # linux
+
#
# target libdwfl
#
@@ -94,7 +93,6 @@
$(LOCAL_PATH)/../libdw \
$(LOCAL_PATH)/../libelf
-
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../bionic-fixup
LOCAL_CFLAGS += -include $(LOCAL_PATH)/../bionic-fixup/AndroidFixup.h
@@ -107,5 +105,3 @@
LOCAL_MODULE:= libdwfl
include $(BUILD_STATIC_LIBRARY)
-
-endif #cur_platform
diff --git a/0.153/libebl/Android.mk b/0.153/libebl/Android.mk
index b1c9004..08dab03 100755
--- a/0.153/libebl/Android.mk
+++ b/0.153/libebl/Android.mk
@@ -14,17 +14,6 @@
LOCAL_PATH := $(call my-dir)
-supported_platforms := linux
-cur_platform := $(filter $(HOST_OS),$(supported_platforms))
-
-ifdef cur_platform
-
-#
-# host libebl
-#
-#
-include $(CLEAR_VARS)
-
LIBEBL_SRC_FILES := \
eblabicfi.c \
eblauxvinfo.c \
@@ -71,6 +60,14 @@
ebl_syscall_abi.c \
eblsysvhashentrysize.c
+ifeq ($(HOST_OS),linux)
+
+#
+# host libebl
+#
+#
+include $(CLEAR_VARS)
+
LOCAL_SRC_FILES := $(LIBEBL_SRC_FILES)
LOCAL_C_INCLUDES := \
@@ -93,6 +90,8 @@
include $(BUILD_HOST_STATIC_LIBRARY)
+endif # linux
+
#
# target libebl
#
@@ -118,5 +117,3 @@
LOCAL_MODULE:= libebl
include $(BUILD_STATIC_LIBRARY)
-
-endif #cur_platform
diff --git a/0.153/libelf/Android.mk b/0.153/libelf/Android.mk
index 7605243..2a733a5 100755
--- a/0.153/libelf/Android.mk
+++ b/0.153/libelf/Android.mk
@@ -14,17 +14,6 @@
LOCAL_PATH := $(call my-dir)
-supported_platforms := linux
-cur_platform := $(filter $(HOST_OS),$(supported_platforms))
-
-ifdef cur_platform
-
-#
-# host libelf
-#
-
-include $(CLEAR_VARS)
-
LIBELF_SRC_FILES := \
elf32_checksum.c \
elf32_fsize.c \
@@ -136,6 +125,14 @@
libelf_next_prime.c \
nlist.c
+ifeq ($(HOST_OS),linux)
+
+#
+# host libelf
+#
+
+include $(CLEAR_VARS)
+
LOCAL_SRC_FILES := $(LIBELF_SRC_FILES)
LOCAL_C_INCLUDES := \
@@ -160,6 +157,8 @@
include $(BUILD_HOST_STATIC_LIBRARY)
+endif # linux
+
#
# target libelf
#
@@ -185,5 +184,3 @@
LOCAL_MODULE := libelf
include $(BUILD_STATIC_LIBRARY)
-
-endif #cur_platform
