Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f374b9d authored by Tor Norbye's avatar Tor Norbye Committed by Android Git Automerger
Browse files

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

* commit '44ff9b8f':
  Tweak default ignore-assets path
parents b25605cd 44ff9b8f

tools/aapt/AaptAssets.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;