diff options
author | Joe Onorato <joeo@google.com> | 2012-08-16 23:38:01 -0700 |
---|---|---|
committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-16 23:38:01 -0700 |
commit | 7793c09ec42bf1a01a5f45f0e723f9a36fcfd9d7 (patch) | |
tree | 91d66291cf8a659a18fdb442d43c8403ffad420a | |
parent | 332e8babe350433b320efc9484f15a5dbdd8c68f (diff) | |
parent | c40049baae4bf58e201a1f8f8bb715c4eee2c45b (diff) | |
download | extras-7793c09ec42bf1a01a5f45f0e723f9a36fcfd9d7.tar.gz |
Merge changes I4e94b8b9,Iae48d489
* changes:
Support for multiple modules with the same name is going away.
Support for multiple modules with the same name is going away.
-rw-r--r-- | ext4_utils/Android.mk | 158 |
1 files changed, 78 insertions, 80 deletions
diff --git a/ext4_utils/Android.mk b/ext4_utils/Android.mk index e8915f1b..99145a4a 100644 --- a/ext4_utils/Android.mk +++ b/ext4_utils/Android.mk @@ -1,161 +1,160 @@ # Copyright 2010 The Android Open Source Project LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) libext4_utils_src_files := \ - make_ext4fs.c \ - ext4fixup.c \ - ext4_utils.c \ - allocate.c \ - contents.c \ - extent.c \ - indirect.c \ - uuid.c \ - sha1.c \ - wipe.c - + make_ext4fs.c \ + ext4fixup.c \ + ext4_utils.c \ + allocate.c \ + contents.c \ + extent.c \ + indirect.c \ + uuid.c \ + sha1.c \ + wipe.c + +# # -- All host/targets including windows +# +include $(CLEAR_VARS) LOCAL_SRC_FILES := $(libext4_utils_src_files) -LOCAL_MODULE := libext4_utils -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := libext4_utils_host LOCAL_C_INCLUDES += external/zlib -LOCAL_STATIC_LIBRARIES += libsparse - +LOCAL_STATIC_LIBRARIES += libsparse_host ifeq ($(HAVE_SELINUX), true) -LOCAL_C_INCLUDES += external/libselinux/include -LOCAL_STATIC_LIBRARIES += libselinux -LOCAL_CFLAGS += -DHAVE_SELINUX + LOCAL_C_INCLUDES += external/libselinux/include + LOCAL_STATIC_LIBRARIES += libselinux + LOCAL_CFLAGS += -DHAVE_SELINUX endif # HAVE_SELINUX - include $(BUILD_HOST_STATIC_LIBRARY) -include $(CLEAR_VARS) +include $(CLEAR_VARS) LOCAL_SRC_FILES := make_ext4fs_main.c LOCAL_MODULE := make_ext4fs -LOCAL_STATIC_LIBRARIES += libext4_utils libsparse libz +LOCAL_STATIC_LIBRARIES += \ + libext4_utils_host \ + libsparse_host \ + libz ifeq ($(HOST_OS),windows) -LOCAL_LDLIBS += -lws2_32 + LOCAL_LDLIBS += -lws2_32 else -ifeq ($(HAVE_SELINUX), true) -LOCAL_C_INCLUDES += external/libselinux/include -LOCAL_STATIC_LIBRARIES += libselinux -LOCAL_CFLAGS += -DHAVE_SELINUX -endif # HAVE_SELINUX + ifeq ($(HAVE_SELINUX), true) + LOCAL_C_INCLUDES += external/libselinux/include + LOCAL_STATIC_LIBRARIES += libselinux + LOCAL_CFLAGS += -DHAVE_SELINUX + endif # HAVE_SELINUX endif - include $(BUILD_HOST_EXECUTABLE) -include $(CLEAR_VARS) +# # -- All host/targets excluding windows +# ifneq ($(HOST_OS),windows) +include $(CLEAR_VARS) LOCAL_SRC_FILES := $(libext4_utils_src_files) LOCAL_MODULE := libext4_utils -LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES += external/zlib -LOCAL_SHARED_LIBRARIES := libsparse libz - +LOCAL_SHARED_LIBRARIES := \ + libsparse \ + libz ifeq ($(HAVE_SELINUX), true) -LOCAL_C_INCLUDES += external/libselinux/include -LOCAL_SHARED_LIBRARIES += libselinux -LOCAL_CFLAGS += -DHAVE_SELINUX + LOCAL_C_INCLUDES += external/libselinux/include + LOCAL_SHARED_LIBRARIES += libselinux + LOCAL_CFLAGS += -DHAVE_SELINUX endif # HAVE_SELINUX - include $(BUILD_SHARED_LIBRARY) -include $(CLEAR_VARS) +include $(CLEAR_VARS) LOCAL_SRC_FILES := $(libext4_utils_src_files) -LOCAL_MODULE := libext4_utils -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := libext4_utils_static LOCAL_C_INCLUDES += external/zlib -LOCAL_STATIC_LIBRARIES += libsparse - +LOCAL_STATIC_LIBRARIES += \ + libsparse_static ifeq ($(HAVE_SELINUX), true) -LOCAL_C_INCLUDES += external/libselinux/include -LOCAL_STATIC_LIBRARIES += libselinux -LOCAL_CFLAGS += -DHAVE_SELINUX + LOCAL_C_INCLUDES += external/libselinux/include + LOCAL_STATIC_LIBRARIES += libselinux + LOCAL_CFLAGS += -DHAVE_SELINUX endif # HAVE_SELINUX - include $(BUILD_STATIC_LIBRARY) -include $(CLEAR_VARS) +include $(CLEAR_VARS) LOCAL_SRC_FILES := make_ext4fs_main.c LOCAL_MODULE := make_ext4fs -LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES += libext4_utils libz - ifeq ($(HAVE_SELINUX), true) -LOCAL_C_INCLUDES += external/libselinux/include -LOCAL_SHARED_LIBRARIES += libselinux -LOCAL_CFLAGS += -DHAVE_SELINUX + LOCAL_C_INCLUDES += external/libselinux/include + LOCAL_SHARED_LIBRARIES += libselinux + LOCAL_CFLAGS += -DHAVE_SELINUX endif # HAVE_SELINUX - include $(BUILD_EXECUTABLE) -include $(CLEAR_VARS) +include $(CLEAR_VARS) LOCAL_SRC_FILES := ext2simg.c LOCAL_MODULE := ext2simg -LOCAL_MODULE_TAGS := optional -LOCAL_SHARED_LIBRARIES += libext4_utils libsparse libz - +LOCAL_SHARED_LIBRARIES += \ + libext4_utils \ + libsparse \ + libz ifeq ($(HAVE_SELINUX), true) -LOCAL_C_INCLUDES += external/libselinux/include -LOCAL_SHARED_LIBRARIES += libselinux -LOCAL_CFLAGS += -DHAVE_SELINUX + LOCAL_C_INCLUDES += external/libselinux/include + LOCAL_SHARED_LIBRARIES += libselinux + LOCAL_CFLAGS += -DHAVE_SELINUX endif # HAVE_SELINUX - include $(BUILD_EXECUTABLE) -include $(CLEAR_VARS) +include $(CLEAR_VARS) LOCAL_SRC_FILES := ext2simg.c LOCAL_MODULE := ext2simg -LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_LIBRARIES += libext4_utils libsparse libz - +LOCAL_STATIC_LIBRARIES += \ + libext4_utils_host \ + libsparse_host \ + libz ifeq ($(HAVE_SELINUX), true) -LOCAL_C_INCLUDES += external/libselinux/include -LOCAL_STATIC_LIBRARIES += libselinux -LOCAL_CFLAGS += -DHAVE_SELINUX + LOCAL_C_INCLUDES += external/libselinux/include + LOCAL_STATIC_LIBRARIES += libselinux + LOCAL_CFLAGS += -DHAVE_SELINUX endif # HAVE_SELINUX - include $(BUILD_HOST_EXECUTABLE) + include $(CLEAR_VARS) LOCAL_SRC_FILES := setup_fs.c LOCAL_MODULE := setup_fs -LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES += libcutils include $(BUILD_EXECUTABLE) -include $(CLEAR_VARS) +include $(CLEAR_VARS) LOCAL_SRC_FILES := ext4fixup_main.c LOCAL_MODULE := ext4fixup -LOCAL_MODULE_TAGS := optional -LOCAL_SHARED_LIBRARIES += libext4_utils libsparse libz - +LOCAL_SHARED_LIBRARIES += \ + libext4_utils \ + libsparse \ + libz include $(BUILD_EXECUTABLE) -include $(CLEAR_VARS) +include $(CLEAR_VARS) LOCAL_SRC_FILES := ext4fixup_main.c LOCAL_MODULE := ext4fixup -LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_LIBRARIES += libext4_utils libsparse libz - +LOCAL_STATIC_LIBRARIES += \ + libext4_utils_host \ + libsparse_host \ + libz include $(BUILD_HOST_EXECUTABLE) -include $(CLEAR_VARS) +include $(CLEAR_VARS) LOCAL_MODULE := mkuserimg.sh LOCAL_SRC_FILES := mkuserimg.sh LOCAL_MODULE_CLASS := EXECUTABLES @@ -163,7 +162,6 @@ LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_MODULE_SUFFIX := LOCAL_BUILT_MODULE_STEM := $(notdir $(LOCAL_SRC_FILES)) LOCAL_IS_HOST_MODULE := true - include $(BUILD_PREBUILT) endif |