Merge "Merge "AAPT: support a new --ignore-assets flag."" into jb-dev

[android/aapt.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index e507fb908c3bddc9c1d703456e0bf08393cb30f2..d0a81dc1b1a8e5965d9f511a62ca617a1ccbe7ef 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -19,6 +19,7 @@ LOCAL_SRC_FILES := \
        Package.cpp \
        StringPool.cpp \
        XMLNode.cpp \
+       ResourceFilter.cpp \
        ResourceTable.cpp \
        Images.cpp \
        Resource.cpp \
@@ -37,13 +38,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),