Merge "Build overlay packages just like regular packages."

[android/aapt.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 499a7aca59323ff47a72c2724f28d12a20dea09c..cb55a9cfd4d688ff9974460b0e4b61927f12964c 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -4,16 +4,22 @@
 # Android Asset Packaging Tool
 #
 
+# This tool is prebuilt if we're doing an app-only build.
+ifeq ($(TARGET_BUILD_APPS),)
+
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
        AaptAssets.cpp \
        Command.cpp \
+       CrunchCache.cpp \
+       FileFinder.cpp \
        Main.cpp \
        Package.cpp \
        StringPool.cpp \
        XMLNode.cpp \
+       ResourceFilter.cpp \
        ResourceTable.cpp \
        Images.cpp \
        Resource.cpp \
@@ -38,7 +44,7 @@ LOCAL_STATIC_LIBRARIES := \
        libpng
 
 ifeq ($(HOST_OS),linux)
-LOCAL_LDLIBS += -lrt
+LOCAL_LDLIBS += -lrt -ldl -lpthread
 endif
 
 # Statically link libz for MinGW (Win SDK under Linux),
@@ -53,3 +59,4 @@ LOCAL_MODULE := aapt
 
 include $(BUILD_HOST_EXECUTABLE)
 
+endif # TARGET_BUILD_APPS