am 3c7c11e4: am dad1eeca: Merge "Only the host part of the elfutils build should be conditional."

* commit '3c7c11e468715fb6c607f8fcab798bd94917568e':
  Only the host part of the elfutils build should be conditional.

4 files changed, 40 insertions, 53 deletions

diff --git a/0.153/libdw/Android.mk b/0.153/libdw/Android.mk
index f9c02af3..52a0923f 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_SRC_FILES := \
         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 @@ LOCAL_MODULE:= libdw
 
 include $(BUILD_HOST_STATIC_LIBRARY)
 
+endif # linux
+
 #
 # target libdw
 #
@@ -180,5 +179,3 @@ LOCAL_MODULE_TAGS := eng
 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 46f3b380..6d283848 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 @@ LIBDWFL_SRC_FILES := \
 	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 @@ LOCAL_MODULE:= libdwfl
 
 include $(BUILD_HOST_STATIC_LIBRARY)
 
+endif # linux
+
 #
 # target libdwfl
 #
@@ -94,7 +93,6 @@ LOCAL_C_INCLUDES := \
 	$(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_CFLAGS += -Wno-pointer-arith
 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 2b695847..e3178c0c 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 @@ LIBEBL_SRC_FILES := \
         ebl_syscall_abi.c \
         eblsysvhashentrysize.c
 
+ifeq ($(HOST_OS),linux)
+
+#
+# host libebl
+#
+#
+include $(CLEAR_VARS)
+
 LOCAL_SRC_FILES := $(LIBEBL_SRC_FILES)
 
 LOCAL_C_INCLUDES := \
@@ -95,6 +92,8 @@ LOCAL_MODULE:= libebl
 
 include $(BUILD_HOST_STATIC_LIBRARY)
 
+endif # linux
+
 #
 # target libebl
 #
@@ -120,5 +119,3 @@ LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -Werror
 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 76052435..2a733a5b 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_SRC_FILES := \
 	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 @@ LOCAL_MODULE := libelf
 
 include $(BUILD_HOST_STATIC_LIBRARY)
 
+endif # linux
+
 #
 # target libelf
 #
@@ -185,5 +184,3 @@ LOCAL_CFLAGS += -include $(LOCAL_PATH)/../bionic-fixup/AndroidFixup.h
 LOCAL_MODULE := libelf
 
 include $(BUILD_STATIC_LIBRARY)
-
-endif #cur_platform