LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove USE_MINGW, whitelist modules for windows"

Browse Source
This commit is contained in:
Dan Willemsen
2015-08-31 19:26:19 +00:00
committed by Gerrit Code Review
parent 1a8697f91c b2fa10bf9c
commit a55701c0be
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
host/windows/prebuilt/usb/Android.mk
View File

@@ -7,6 +7,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_SRC_FILES_x86 := AdbWinApi.a LOCAL_SRC_FILES_x86 := AdbWinApi.a
LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_SUFFIX := .a
LOCAL_MULTILIB := 32 LOCAL_MULTILIB := 32
LOCAL_MODULE_HOST_OS := windows
include $(BUILD_PREBUILT) include $(BUILD_PREBUILT)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@@ -16,6 +17,7 @@ LOCAL_MODULE_CLASS := EXECUTABLES
LOCAL_SRC_FILES_x86 := AdbWinApi.dll LOCAL_SRC_FILES_x86 := AdbWinApi.dll
LOCAL_MODULE_SUFFIX := .dll LOCAL_MODULE_SUFFIX := .dll
LOCAL_MULTILIB := 32 LOCAL_MULTILIB := 32
LOCAL_MODULE_HOST_OS := windows
include $(BUILD_PREBUILT) include $(BUILD_PREBUILT)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@@ -25,4 +27,5 @@ LOCAL_MODULE_CLASS := EXECUTABLES
LOCAL_SRC_FILES_x86 := AdbWinUsbApi.dll LOCAL_SRC_FILES_x86 := AdbWinUsbApi.dll
LOCAL_MODULE_SUFFIX := .dll LOCAL_MODULE_SUFFIX := .dll
LOCAL_MULTILIB := 32 LOCAL_MULTILIB := 32
LOCAL_MODULE_HOST_OS := windows
include $(BUILD_PREBUILT) include $(BUILD_PREBUILT)

13
tools/etc1tool/Android.mk
View File

@@ -21,18 +21,13 @@ LOCAL_STATIC_LIBRARIES := \
libpng \ libpng \
libETC1 libETC1
ifeq ($(HOST_OS),linux)
LOCAL_LDLIBS += -lrt
endif
# Statically link libz for MinGW (Win SDK under Linux), # Statically link libz for MinGW (Win SDK under Linux),
# and dynamically link for all others. # and dynamically link for all others.
ifneq ($(strip $(USE_MINGW)),) LOCAL_STATIC_LIBRARIES_windows := libz
LOCAL_STATIC_LIBRARIES += libz LOCAL_LDLIBS_darwin := -lz
else LOCAL_LDLIBS_linux := -lrt -lz
LOCAL_LDLIBS += -lz
endif
LOCAL_MODULE := etc1tool LOCAL_MODULE := etc1tool
LOCAL_MODULE_HOST_OS := darwin linux windows
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)