projects
/
android
/
aapt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp
[android/aapt.git]
/
Android.mk
diff --git
a/Android.mk
b/Android.mk
index 094b7db3b4c4c9cd7f9b46a165c4718b25fb87da..e507fb908c3bddc9c1d703456e0bf08393cb30f2 100644
(file)
--- a/
Android.mk
+++ b/
Android.mk
@@
-13,6
+13,8
@@
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
AaptAssets.cpp \
Command.cpp \
+ CrunchCache.cpp \
+ FileFinder.cpp \
Main.cpp \
Package.cpp \
StringPool.cpp \