diff options
| author | Joe Onorato <joeo@google.com> | 2012-07-23 19:15:14 -0700 |
|---|---|---|
| committer | Joe Onorato <joeo@google.com> | 2012-08-15 19:52:52 -0700 |
| commit | 5069b01e21129fe2d42a28e850645376560f2029 (patch) | |
| tree | bea871bb0942e5399a6de744e29f7e276356c962 | |
| parent | 1926c15a1219bc8426e0b9131633e02c76929fb7 (diff) | |
| download | system_core-5069b01e21129fe2d42a28e850645376560f2029.zip system_core-5069b01e21129fe2d42a28e850645376560f2029.tar.gz system_core-5069b01e21129fe2d42a28e850645376560f2029.tar.bz2 | |
Support for multiple modules with the same name is going away.
Change-Id: I5006b467978071f9107babe532efa71d05061580
| -rw-r--r-- | fastboot/Android.mk | 5 | ||||
| -rw-r--r-- | libsparse/Android.mk | 72 |
2 files changed, 39 insertions, 38 deletions
diff --git a/fastboot/Android.mk b/fastboot/Android.mk index b6fbd3f..905f759 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 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) + |