ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes I5006b467,I0118cebf,Ibc792367

Browse source 
* changes:
  Support for multiple modules with the same name is going away.
  Fix build by removing TAGS from host module
  libext4_utils on host is now called libext4_utils_host so there is no name conflict
This commit is contained in:
Joe Onorato 2012-08-17 00:38:57 -07:00 • committed by android code review
commit a11f4bcfd4
3 changed files with 50 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fastboot/Android.mk
View file

@ -48,7 +48,13 @@ ifeq ($(HOST_OS),windows)
LOCAL_C_INCLUDES += development/host/windows/usb/api LOCAL_C_INCLUDES += development/host/windows/usb/api
endif 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) ifneq ($(HOST_OS),windows)
ifeq ($(HAVE_SELINUX), true) ifeq ($(HAVE_SELINUX), true)
@ -57,8 +63,11 @@ endif # HAVE_SELINUX
endif # HOST_OS != windows endif # HOST_OS != windows
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)
$(call dist-for-goals,dist_files,$(LOCAL_BUILT_MODULE)) $(call dist-for-goals,dist_files,$(LOCAL_BUILT_MODULE))
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := usbtest.c usb_linux.c LOCAL_SRC_FILES := usbtest.c usb_linux.c

1
gpttool/Android.mk
View file

@ -7,7 +7,6 @@ LOCAL_SRC_FILES := gpttool.c
LOCAL_STATIC_LIBRARIES := libz LOCAL_STATIC_LIBRARIES := libz
LOCAL_MODULE := gpttool LOCAL_MODULE := gpttool
LOCAL_MODULE_TAGS := eng
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)

82
libsparse/Android.mk
View file

@ -10,92 +10,90 @@ libsparse_src_files := \
sparse_err.c \ sparse_err.c \
sparse_read.c sparse_read.c
include $(CLEAR_VARS)
include $(CLEAR_VARS)
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_SRC_FILES := $(libsparse_src_files) LOCAL_SRC_FILES := $(libsparse_src_files)
LOCAL_MODULE := libsparse LOCAL_MODULE := libsparse_host
LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_LIBRARIES := libz LOCAL_STATIC_LIBRARIES := libz
LOCAL_C_INCLUDES += $(LOCAL_PATH)/include external/zlib LOCAL_C_INCLUDES += $(LOCAL_PATH)/include external/zlib
include $(BUILD_HOST_STATIC_LIBRARY) include $(BUILD_HOST_STATIC_LIBRARY)
include $(CLEAR_VARS)
include $(CLEAR_VARS)
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_SRC_FILES := $(libsparse_src_files) LOCAL_SRC_FILES := $(libsparse_src_files)
LOCAL_MODULE := libsparse LOCAL_MODULE := libsparse
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES += $(LOCAL_PATH)/include external/zlib LOCAL_C_INCLUDES += $(LOCAL_PATH)/include external/zlib
LOCAL_SHARED_LIBRARIES := libz LOCAL_SHARED_LIBRARIES := \
libz
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
include $(CLEAR_VARS)
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_SRC_FILES := $(libsparse_src_files) LOCAL_SRC_FILES := $(libsparse_src_files)
LOCAL_MODULE := libsparse LOCAL_MODULE := libsparse_static
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES += $(LOCAL_PATH)/include external/zlib LOCAL_C_INCLUDES += $(LOCAL_PATH)/include external/zlib
LOCAL_STATIC_LIBRARIES := libz LOCAL_STATIC_LIBRARIES := libz
include $(BUILD_STATIC_LIBRARY) 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 \ LOCAL_SRC_FILES := simg2img.c \
sparse_crc32.c sparse_crc32.c
LOCAL_MODULE := simg2img LOCAL_MODULE := simg2img
LOCAL_MODULE_TAGS := debug LOCAL_STATIC_LIBRARIES := \
LOCAL_STATIC_LIBRARIES := libsparse libz libsparse_static \
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
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := img2simg.c LOCAL_SRC_FILES := img2simg.c
LOCAL_MODULE := img2simg LOCAL_MODULE := img2simg_host
LOCAL_MODULE_TAGS := debug # Need a unique module name, but exe should still be called simg2img
LOCAL_STATIC_LIBRARIES := libsparse libz LOCAL_MODULE_STEM := img2simg
LOCAL_STATIC_LIBRARIES := \
libsparse_host \
libz
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)
include $(CLEAR_VARS)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := img2simg.c LOCAL_SRC_FILES := img2simg.c
LOCAL_MODULE := img2simg LOCAL_MODULE := img2simg
LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := \
LOCAL_STATIC_LIBRARIES := libsparse libz libsparse_static \
libz
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := simg2simg.c LOCAL_SRC_FILES := simg2simg.c
LOCAL_MODULE := simg2simg LOCAL_MODULE := simg2simg
LOCAL_MODULE_TAGS := debug LOCAL_STATIC_LIBRARIES := \
LOCAL_STATIC_LIBRARIES := libsparse libz libsparse_host \
libz
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)
include $(CLEAR_VARS)
include $(CLEAR_VARS)
LOCAL_MODULE := simg_dump.py LOCAL_MODULE := simg_dump.py
LOCAL_MODULE_TAGS := debug
LOCAL_SRC_FILES := simg_dump.py LOCAL_SRC_FILES := simg_dump.py
LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_MODULE_CLASS := EXECUTABLES
LOCAL_IS_HOST_MODULE := true LOCAL_IS_HOST_MODULE := true
include $(BUILD_PREBUILT) include $(BUILD_PREBUILT)