resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev

[android/aapt.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index eeddd4b0a5b6b06ad9d8482b0626b46ac41a710f..5b8866901e033b7408be4250796871ef9f3890ea 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -20,6 +20,7 @@ LOCAL_SRC_FILES := \
        StringPool.cpp \
        XMLNode.cpp \
        ResourceFilter.cpp \
+       ResourceIdCache.cpp \
        ResourceTable.cpp \
        Images.cpp \
        Resource.cpp \
@@ -34,7 +35,6 @@ 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
@@ -42,6 +42,7 @@ LOCAL_C_INCLUDES += build/libs/host/include
 #LOCAL_WHOLE_STATIC_LIBRARIES := 
 LOCAL_STATIC_LIBRARIES := \
        libhost \
+       libandroidfw \
        libutils \
        libcutils \
        libexpat \