From 2ffe3c8ac4b0d5a0716c4b131743b5983c99ce59 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Wed, 18 Jul 2012 12:03:33 -0700 Subject: [PATCH 1/3] libext4_utils on host is now called libext4_utils_host so there is no name conflict Change-Id: Ibc7923676925ed6942b3f672ee764cfaa98ee96e --- fastboot/Android.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fastboot/Android.mk b/fastboot/Android.mk index e3261a7f7..b6fbd3fd6 100644 --- a/fastboot/Android.mk +++ b/fastboot/Android.mk @@ -48,7 +48,13 @@ ifeq ($(HOST_OS),windows) LOCAL_C_INCLUDES += development/host/windows/usb/api endif -LOCAL_STATIC_LIBRARIES := $(EXTRA_STATIC_LIBS) libzipfile libunz libext4_utils libsparse libz +LOCAL_STATIC_LIBRARIES := \ + $(EXTRA_STATIC_LIBS) \ + libzipfile \ + libunz \ + libext4_utils_host \ + libsparse \ + libz ifneq ($(HOST_OS),windows) ifeq ($(HAVE_SELINUX), true) From 1926c15a1219bc8426e0b9131633e02c76929fb7 Mon Sep 17 00:00:00 2001 From: "Mike J. Chen" Date: Fri, 20 Jul 2012 18:35:32 -0700 Subject: [PATCH 2/3] Fix build by removing TAGS from host module Change-Id: I0118cebff021b435baea0b46dd3c43250ef96632 Signed-off-by: Mike J. Chen --- gpttool/Android.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/gpttool/Android.mk b/gpttool/Android.mk index a9fffe901..b8f9844c7 100644 --- a/gpttool/Android.mk +++ b/gpttool/Android.mk @@ -7,7 +7,6 @@ LOCAL_SRC_FILES := gpttool.c LOCAL_STATIC_LIBRARIES := libz LOCAL_MODULE := gpttool -LOCAL_MODULE_TAGS := eng include $(BUILD_HOST_EXECUTABLE) From 5069b01e21129fe2d42a28e850645376560f2029 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Mon, 23 Jul 2012 19:15:14 -0700 Subject: [PATCH 3/3] Support for multiple modules with the same name is going away. Change-Id: I5006b467978071f9107babe532efa71d05061580 --- fastboot/Android.mk | 5 ++- libsparse/Android.mk | 82 +++++++++++++++++++++----------------------- 2 files changed, 44 insertions(+), 43 deletions(-) diff --git a/fastboot/Android.mk b/fastboot/Android.mk index b6fbd3fd6..905f7598f 100644 --- a/fastboot/Android.mk +++ b/fastboot/Android.mk @@ -53,7 +53,7 @@ LOCAL_STATIC_LIBRARIES := \ libzipfile \ libunz \ libext4_utils_host \ - libsparse \ + libsparse_host \ libz ifneq ($(HOST_OS),windows) @@ -63,8 +63,11 @@ endif # HAVE_SELINUX endif # HOST_OS != windows include $(BUILD_HOST_EXECUTABLE) + + $(call dist-for-goals,dist_files,$(LOCAL_BUILT_MODULE)) + ifeq ($(HOST_OS),linux) include $(CLEAR_VARS) LOCAL_SRC_FILES := usbtest.c usb_linux.c diff --git a/libsparse/Android.mk b/libsparse/Android.mk index 69b52c387..9025cc025 100644 --- a/libsparse/Android.mk +++ b/libsparse/Android.mk @@ -10,92 +10,90 @@ libsparse_src_files := \ sparse_err.c \ sparse_read.c -include $(CLEAR_VARS) +include $(CLEAR_VARS) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_SRC_FILES := $(libsparse_src_files) -LOCAL_MODULE := libsparse -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := libsparse_host LOCAL_STATIC_LIBRARIES := libz LOCAL_C_INCLUDES += $(LOCAL_PATH)/include external/zlib - include $(BUILD_HOST_STATIC_LIBRARY) -include $(CLEAR_VARS) +include $(CLEAR_VARS) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_SRC_FILES := $(libsparse_src_files) LOCAL_MODULE := libsparse -LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES += $(LOCAL_PATH)/include external/zlib -LOCAL_SHARED_LIBRARIES := libz - +LOCAL_SHARED_LIBRARIES := \ + libz include $(BUILD_SHARED_LIBRARY) -include $(CLEAR_VARS) +include $(CLEAR_VARS) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_SRC_FILES := $(libsparse_src_files) -LOCAL_MODULE := libsparse -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := libsparse_static LOCAL_C_INCLUDES += $(LOCAL_PATH)/include external/zlib LOCAL_STATIC_LIBRARIES := libz - include $(BUILD_STATIC_LIBRARY) -include $(CLEAR_VARS) +include $(CLEAR_VARS) +LOCAL_SRC_FILES := simg2img.c \ + sparse_crc32.c +LOCAL_MODULE := simg2img_host +# Need a unique module name, but exe should still be called simg2img +LOCAL_MODULE_STEM := simg2img +LOCAL_STATIC_LIBRARIES := \ + libsparse_host \ + libz +include $(BUILD_HOST_EXECUTABLE) + + +include $(CLEAR_VARS) LOCAL_SRC_FILES := simg2img.c \ sparse_crc32.c LOCAL_MODULE := simg2img -LOCAL_MODULE_TAGS := debug -LOCAL_STATIC_LIBRARIES := libsparse libz - -include $(BUILD_HOST_EXECUTABLE) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := simg2img.c \ - sparse_crc32.c -LOCAL_MODULE := simg2img -LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_LIBRARIES := libsparse libz - +LOCAL_STATIC_LIBRARIES := \ + libsparse_static \ + libz include $(BUILD_EXECUTABLE) + include $(CLEAR_VARS) - LOCAL_SRC_FILES := img2simg.c -LOCAL_MODULE := img2simg -LOCAL_MODULE_TAGS := debug -LOCAL_STATIC_LIBRARIES := libsparse libz - +LOCAL_MODULE := img2simg_host +# Need a unique module name, but exe should still be called simg2img +LOCAL_MODULE_STEM := img2simg +LOCAL_STATIC_LIBRARIES := \ + libsparse_host \ + libz include $(BUILD_HOST_EXECUTABLE) -include $(CLEAR_VARS) +include $(CLEAR_VARS) LOCAL_SRC_FILES := img2simg.c LOCAL_MODULE := img2simg -LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_LIBRARIES := libsparse libz - +LOCAL_STATIC_LIBRARIES := \ + libsparse_static \ + libz include $(BUILD_EXECUTABLE) -include $(CLEAR_VARS) +include $(CLEAR_VARS) LOCAL_SRC_FILES := simg2simg.c LOCAL_MODULE := simg2simg -LOCAL_MODULE_TAGS := debug -LOCAL_STATIC_LIBRARIES := libsparse libz - +LOCAL_STATIC_LIBRARIES := \ + libsparse_host \ + libz include $(BUILD_HOST_EXECUTABLE) -include $(CLEAR_VARS) +include $(CLEAR_VARS) LOCAL_MODULE := simg_dump.py -LOCAL_MODULE_TAGS := debug LOCAL_SRC_FILES := simg_dump.py LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_IS_HOST_MODULE := true - include $(BUILD_PREBUILT) +