diff options
| -rw-r--r-- | fastboot/Android.mk | 11 | ||||
| -rw-r--r-- | gpttool/Android.mk | 1 | ||||
| -rw-r--r-- | libsparse/Android.mk | 72 |
3 files changed, 45 insertions, 39 deletions
diff --git a/fastboot/Android.mk b/fastboot/Android.mk index e3261a7..905f759 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_host \ + libz ifneq ($(HOST_OS),windows) ifeq ($(HAVE_SELINUX), true) @@ -57,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/gpttool/Android.mk b/gpttool/Android.mk index a9fffe9..b8f9844 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) diff --git a/libsparse/Android.mk b/libsparse/Android.mk index 69b52c3..9025cc0 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 -LOCAL_MODULE_TAGS := debug -LOCAL_STATIC_LIBRARIES := libsparse libz - +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) +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) +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) + |