projects
/
android
/
aapt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
am 46cc524a: (-s ours) am f7243dcc: Add --error-on-failed-insert option to aapt....
[android/aapt.git]
/
Android.mk
diff --git
a/Android.mk
b/Android.mk
index b339a2cd2eb024809bf9de0081fe4fe9160a8ccc..d9b06815bf658607637b87b062968fd93c190790 100644
(file)
--- a/
Android.mk
+++ b/
Android.mk
@@
-13,10
+13,13
@@
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
AaptAssets.cpp \
Command.cpp \
LOCAL_SRC_FILES := \
AaptAssets.cpp \
Command.cpp \
+ CrunchCache.cpp \
+ FileFinder.cpp \
Main.cpp \
Package.cpp \
StringPool.cpp \
XMLNode.cpp \
Main.cpp \
Package.cpp \
StringPool.cpp \
XMLNode.cpp \
+ ResourceFilter.cpp \
ResourceTable.cpp \
Images.cpp \
Resource.cpp \
ResourceTable.cpp \
Images.cpp \
Resource.cpp \
@@
-26,8
+29,11
@@
LOCAL_SRC_FILES := \
LOCAL_CFLAGS += -Wno-format-y2k
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
LOCAL_C_INCLUDES += external/libpng
LOCAL_C_INCLUDES += external/zlib
LOCAL_C_INCLUDES += build/libs/host/include
@@
-35,13
+41,14
@@
LOCAL_C_INCLUDES += build/libs/host/include
#LOCAL_WHOLE_STATIC_LIBRARIES :=
LOCAL_STATIC_LIBRARIES := \
libhost \
#LOCAL_WHOLE_STATIC_LIBRARIES :=
LOCAL_STATIC_LIBRARIES := \
libhost \
+ libandroidfw \
libutils \
libcutils \
libexpat \
libpng
ifeq ($(HOST_OS),linux)
libutils \
libcutils \
libexpat \
libpng
ifeq ($(HOST_OS),linux)
-LOCAL_LDLIBS += -lrt
+LOCAL_LDLIBS += -lrt
-ldl -lpthread
endif
# Statically link libz for MinGW (Win SDK under Linux),
endif
# Statically link libz for MinGW (Win SDK under Linux),