am bcf2adeb: Merge "aapt: Allow raw "%" in unformatted string-arrays"

[android/aapt.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index fdc859c01c4d08d798580f23777de6c069f86e34..094b7db3b4c4c9cd7f9b46a165c4718b25fb87da 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -4,6 +4,9 @@
 # Android Asset Packaging Tool
 #
 
 # 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)
 
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 


@@ -17,7 +20,10 @@ LOCAL_SRC_FILES := \
        ResourceTable.cpp \
        Images.cpp \
        Resource.cpp \
        ResourceTable.cpp \
        Images.cpp \
        Resource.cpp \

-    SourcePos.cpp
+    SourcePos.cpp \
+    ZipEntry.cpp \
+    ZipFile.cpp
+

 
 LOCAL_CFLAGS += -Wno-format-y2k
 
 
 LOCAL_CFLAGS += -Wno-format-y2k
 


@@ -34,19 +40,20 @@ LOCAL_STATIC_LIBRARIES := \
        libexpat \
        libpng
 
        libexpat \
        libpng
 

-LOCAL_LDLIBS := -lz
-

 ifeq ($(HOST_OS),linux)
 ifeq ($(HOST_OS),linux)

-LOCAL_LDLIBS += -lrt
+LOCAL_LDLIBS += -lrt -lpthread

 endif
 
 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
 
 LOCAL_MODULE := aapt
 
 include $(BUILD_HOST_EXECUTABLE)
 

+endif # TARGET_BUILD_APPS