From: Tor Norbye <tnorbye@google.com>
Date: Tue, 5 Jun 2012 15:45:20 +0000 (-0700)
Subject: am 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore-assets path"
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/86001ed2bff0362b580bb1d977e7bf6f9a93815b?hp=40b7bac653fa2b644f6d65444a546b8fe176ca3d

am 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore-assets path"

* commit '44ff9b8f9294e015031fc9293974604771e5efdd':
  Tweak default ignore-assets path
---

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index f2fa3f5..46b8a27 100644
--- a/AaptAssets.cpp
+++ b/AaptAssets.cpp
@@ -58,7 +58,7 @@ static bool validateFileName(const char* fileName)
 
 // The default to use if no other ignore pattern is defined.
 const char * const gDefaultIgnoreAssets =
-    "!.svn:!.git:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~";
+    "!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~";
 // The ignore pattern that can be passed via --ignore-assets in Main.cpp
 const char * gUserIgnoreAssets = NULL;