am a4e10cc7: am 6080cc5f: 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 d9b06815bf658607637b87b062968fd93c190790..5b8866901e033b7408be4250796871ef9f3890ea 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -20,6 +20,7 @@ LOCAL_SRC_FILES := \
        StringPool.cpp \
        XMLNode.cpp \
        ResourceFilter.cpp \
        StringPool.cpp \
        XMLNode.cpp \
        ResourceFilter.cpp \

+       ResourceIdCache.cpp \

        ResourceTable.cpp \
        Images.cpp \
        Resource.cpp \
        ResourceTable.cpp \
        Images.cpp \
        Resource.cpp \