diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2015-08-19 11:25:01 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2015-08-28 22:20:33 +0000 |
| commit | 5b1d242807cef77046a600efbe98b0c2d6c6233d (patch) | |
| tree | bd52e953faa03afb657e7b1c59f95dbb69ef5ed6 | |
| parent | 70878368831e71ce6344d43d7c0f4575e189b425 (diff) | |
| download | dalvik-5b1d242807cef77046a600efbe98b0c2d6c6233d.tar.gz | |
Remove USE_MINGW, whitelist modules for windows
Bug: 23566667
Change-Id: I3968d26532083ea1b5f7935c07c9c8cd958c9005
| -rw-r--r-- | dexdump/Android.mk | 10 | ||||
| -rw-r--r-- | libdex/Android.mk | 2 | ||||
| -rw-r--r-- | tools/dmtracedump/Android.mk | 3 | ||||
| -rw-r--r-- | tools/hprof-conv/Android.mk | 2 |
4 files changed, 7 insertions, 10 deletions
diff --git a/dexdump/Android.mk b/dexdump/Android.mk index d0116bc74..31d444377 100644 --- a/dexdump/Android.mk +++ b/dexdump/Android.mk @@ -58,13 +58,11 @@ endif # !SDK_ONLY ## include $(CLEAR_VARS) LOCAL_MODULE := dexdump -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_HOST_OS := darwin linux windows LOCAL_SRC_FILES := $(dexdump_src_files) LOCAL_C_INCLUDES := $(dexdump_c_includes) LOCAL_STATIC_LIBRARIES := $(dexdump_static_libraries) -ifneq ($(strip $(USE_MINGW)),) -LOCAL_STATIC_LIBRARIES += libz -else -LOCAL_LDLIBS += -lpthread -lz -endif +LOCAL_STATIC_LIBRARIES_windows += libz +LOCAL_LDLIBS_darwin += -lpthread -lz +LOCAL_LDLIBS_linux += -lpthread -lz include $(BUILD_HOST_EXECUTABLE) diff --git a/libdex/Android.mk b/libdex/Android.mk index cabc8dc03..960d689c3 100644 --- a/libdex/Android.mk +++ b/libdex/Android.mk @@ -72,6 +72,6 @@ LOCAL_C_INCLUDES += $(dex_include_files) LOCAL_CPPFLAGS := -std=gnu++11 LOCAL_STATIC_LIBRARIES := liblog libutils LOCAL_WHOLE_STATIC_LIBRARIES := libziparchive-host -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_HOST_OS := darwin linux windows LOCAL_MODULE := libdex include $(BUILD_HOST_STATIC_LIBRARY) diff --git a/tools/dmtracedump/Android.mk b/tools/dmtracedump/Android.mk index 933f4e5d8..aea6a840f 100644 --- a/tools/dmtracedump/Android.mk +++ b/tools/dmtracedump/Android.mk @@ -10,13 +10,12 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := TraceDump.c LOCAL_CFLAGS += -O0 -g -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_HOST_OS := darwin linux windows LOCAL_MODULE := dmtracedump include $(BUILD_HOST_EXECUTABLE) include $(CLEAR_VARS) LOCAL_SRC_FILES := CreateTestTrace.c LOCAL_CFLAGS += -O0 -g -LOCAL_MODULE_TAGS := optional LOCAL_MODULE := create_test_dmtrace include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/hprof-conv/Android.mk b/tools/hprof-conv/Android.mk index dad399efc..5f74eb4d2 100644 --- a/tools/hprof-conv/Android.mk +++ b/tools/hprof-conv/Android.mk @@ -16,6 +16,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := HprofConv.c -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_HOST_OS := darwin linux windows LOCAL_MODULE := hprof-conv include $(BUILD_HOST_EXECUTABLE) |