As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files

[android/aapt.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 2d8973d89b72848752c8945bbc19540b554cefa6..b339a2cd2eb024809bf9de0081fe4fe9160a8ccc 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -4,6 +4,9 @@
 # Android Asset Packaging Tool
 #
 
+# This tool is prebuilt if we're doing an app-only build.
+ifeq ($(TARGET_BUILD_APPS),)
+
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -37,19 +40,20 @@ LOCAL_STATIC_LIBRARIES := \
        libexpat \
        libpng
 
-LOCAL_LDLIBS := -lz
-
 ifeq ($(HOST_OS),linux)
 LOCAL_LDLIBS += -lrt
 endif
 
-ifeq ($(HOST_OS),windows)
-ifeq ($(strip $(USE_CYGWIN),),)
-LOCAL_LDLIBS += -lws2_32
-endif
+# Statically link libz for MinGW (Win SDK under Linux),
+# and dynamically link for all others.
+ifneq ($(strip $(USE_MINGW)),)
+  LOCAL_STATIC_LIBRARIES += libz
+else
+  LOCAL_LDLIBS += -lz
 endif
 
 LOCAL_MODULE := aapt
 
 include $(BUILD_HOST_EXECUTABLE)
 
+endif # TARGET_BUILD_APPS