am d7252571: Merge "Add --error-on-failed-insert option to aapt."

[android/aapt.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index a3e5d9a503b456d39e89275e3f35dcdbd6af376d..d9b06815bf658607637b87b062968fd93c190790 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -29,8 +29,11 @@ LOCAL_SRC_FILES := \
 
 
 LOCAL_CFLAGS += -Wno-format-y2k
+ifeq (darwin,$(HOST_OS))
+LOCAL_CFLAGS += -D_DARWIN_UNLIMITED_STREAMS
+endif
+
 
-LOCAL_C_INCLUDES += external/expat/lib
 LOCAL_C_INCLUDES += external/libpng
 LOCAL_C_INCLUDES += external/zlib
 LOCAL_C_INCLUDES += build/libs/host/include
@@ -38,13 +41,14 @@ LOCAL_C_INCLUDES += build/libs/host/include
 #LOCAL_WHOLE_STATIC_LIBRARIES := 
 LOCAL_STATIC_LIBRARIES := \
        libhost \
+       libandroidfw \
        libutils \
        libcutils \
        libexpat \
        libpng
 
 ifeq ($(HOST_OS),linux)
-LOCAL_LDLIBS += -lrt -lpthread
+LOCAL_LDLIBS += -lrt -ldl -lpthread
 endif
 
 # Statically link libz for MinGW (Win SDK under Linux),