diff options
author | Elliott Hughes <enh@google.com> | 2014-08-22 22:05:57 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-22 22:05:58 +0000 |
commit | dad1eecaf9bcc826dacdf2855b7bd1adddd02a59 (patch) | |
tree | e64acee178a94e8ded4e0179d960f7f73373bace | |
parent | f73f8d6e844c98a03e43a826ce7a5b430b0a22db (diff) | |
parent | 7c6f5a899134a0984cac34fc30aaa4b546821181 (diff) | |
download | android_external_elfutils-dad1eecaf9bcc826dacdf2855b7bd1adddd02a59.tar.gz android_external_elfutils-dad1eecaf9bcc826dacdf2855b7bd1adddd02a59.tar.bz2 android_external_elfutils-dad1eecaf9bcc826dacdf2855b7bd1adddd02a59.zip |
Merge "Only the host part of the elfutils build should be conditional."
-rwxr-xr-x | 0.153/libdw/Android.mk | 23 | ||||
-rwxr-xr-x | 0.153/libdwfl/Android.mk | 24 | ||||
-rwxr-xr-x | 0.153/libebl/Android.mk | 23 | ||||
-rwxr-xr-x | 0.153/libelf/Android.mk | 23 |
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 5af01f9b..69ddaa50 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 := \ @@ -91,6 +88,8 @@ LOCAL_MODULE:= libebl include $(BUILD_HOST_STATIC_LIBRARY) +endif # linux + # # target libebl # @@ -116,5 +115,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 |