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

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

diff --combined AaptAssets.cpp
index f2fa3f57e245f83798174d181ca2e9348445830e,012f84eb797fe0b3c8bd07330f06fc58c847d8e8..46b8a274b1af2dfccfcc782dfe66afcf4d483310
--- 1/AaptAssets.cpp
--- 2/AaptAssets.cpp
+++ b/AaptAssets.cpp
@@@ -58,7 -58,7 +58,7 @@@ static bool validateFileName(const char
  
  // 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;
  
@@@ -122,7 -122,6 +122,7 @@@ static bool isHidden(const char *root, 
          if (token[0] == '*') {
              // Match *suffix
              token++;
 +            n--;
              if (n <= plen) {
                  ignore = strncasecmp(token, path + plen - n, n) == 0;
              }
@@@ -1057,11 -1056,6 +1057,11 @@@ bool AaptGroupEntry::getUiModeTypeName(
                (out->uiMode&~ResTable_config::MASK_UI_MODE_TYPE)
                | ResTable_config::UI_MODE_TYPE_TELEVISION;
          return true;
 +    } else if (strcmp(name, "appliance") == 0) {
 +      if (out) out->uiMode =
 +              (out->uiMode&~ResTable_config::MASK_UI_MODE_TYPE)
 +              | ResTable_config::UI_MODE_TYPE_APPLIANCE;
 +        return true;
      }
  
      return false;
@@@ -1122,17 -1116,12 +1122,17 @@@ bool AaptGroupEntry::getDensityName(con
          if (out) out->density = ResTable_config::DENSITY_HIGH;
          return true;
      }
 -    
 +
      if (strcmp(name, "xhdpi") == 0) {
 -        if (out) out->density = ResTable_config::DENSITY_MEDIUM*2;
 +        if (out) out->density = ResTable_config::DENSITY_XHIGH;
          return true;
      }
 -    
 +
 +    if (strcmp(name, "xxhdpi") == 0) {
 +        if (out) out->density = ResTable_config::DENSITY_XXHIGH;
 +        return true;
 +    }
 +
      char* c = (char*)name;
      while (*c >= '0' && *c <= '9') {
          c++;
@@@ -1875,49 -1864,6 +1875,49 @@@ String8 AaptDir::getPrintableSource() c
  // =========================================================================
  // =========================================================================
  
 +status_t AaptSymbols::applyJavaSymbols(const sp<AaptSymbols>& javaSymbols)
 +{
 +    status_t err = NO_ERROR;
 +    size_t N = javaSymbols->mSymbols.size();
 +    for (size_t i=0; i<N; i++) {
 +        const String8& name = javaSymbols->mSymbols.keyAt(i);
 +        const AaptSymbolEntry& entry = javaSymbols->mSymbols.valueAt(i);
 +        ssize_t pos = mSymbols.indexOfKey(name);
 +        if (pos < 0) {
 +            entry.sourcePos.error("Symbol '%s' declared with <java-symbol> not defined\n", name.string());
 +            err = UNKNOWN_ERROR;
 +            continue;
 +        }
 +        //printf("**** setting symbol #%d/%d %s to isJavaSymbol=%d\n",
 +        //        i, N, name.string(), entry.isJavaSymbol ? 1 : 0);
 +        mSymbols.editValueAt(pos).isJavaSymbol = entry.isJavaSymbol;
 +    }
 +
 +    N = javaSymbols->mNestedSymbols.size();
 +    for (size_t i=0; i<N; i++) {
 +        const String8& name = javaSymbols->mNestedSymbols.keyAt(i);
 +        const sp<AaptSymbols>& symbols = javaSymbols->mNestedSymbols.valueAt(i);
 +        ssize_t pos = mNestedSymbols.indexOfKey(name);
 +        if (pos < 0) {
 +            SourcePos pos;
 +            pos.error("Java symbol dir %s not defined\n", name.string());
 +            err = UNKNOWN_ERROR;
 +            continue;
 +        }
 +        //printf("**** applying java symbols in dir %s\n", name.string());
 +        status_t myerr = mNestedSymbols.valueAt(pos)->applyJavaSymbols(symbols);
 +        if (myerr != NO_ERROR) {
 +            err = myerr;
 +        }
 +    }
 +
 +    return err;
 +}
 +
 +// =========================================================================
 +// =========================================================================
 +// =========================================================================
 +
  AaptAssets::AaptAssets()
      : AaptDir(String8(), String8()),
        mChanged(false), mHaveIncludedAssets(false), mRes(NULL)
@@@ -2485,48 -2431,6 +2485,48 @@@ sp<AaptSymbols> AaptAssets::getSymbolsF
      return sym;
  }
  
 +sp<AaptSymbols> AaptAssets::getJavaSymbolsFor(const String8& name)
 +{
 +    sp<AaptSymbols> sym = mJavaSymbols.valueFor(name);
 +    if (sym == NULL) {
 +        sym = new AaptSymbols();
 +        mJavaSymbols.add(name, sym);
 +    }
 +    return sym;
 +}
 +
 +status_t AaptAssets::applyJavaSymbols()
 +{
 +    size_t N = mJavaSymbols.size();
 +    for (size_t i=0; i<N; i++) {
 +        const String8& name = mJavaSymbols.keyAt(i);
 +        const sp<AaptSymbols>& symbols = mJavaSymbols.valueAt(i);
 +        ssize_t pos = mSymbols.indexOfKey(name);
 +        if (pos < 0) {
 +            SourcePos pos;
 +            pos.error("Java symbol dir %s not defined\n", name.string());
 +            return UNKNOWN_ERROR;
 +        }
 +        //printf("**** applying java symbols in dir %s\n", name.string());
 +        status_t err = mSymbols.valueAt(pos)->applyJavaSymbols(symbols);
 +        if (err != NO_ERROR) {
 +            return err;
 +        }
 +    }
 +
 +    return NO_ERROR;
 +}
 +
 +bool AaptAssets::isJavaSymbol(const AaptSymbolEntry& sym, bool includePrivate) const {
 +    //printf("isJavaSymbol %s: public=%d, includePrivate=%d, isJavaSymbol=%d\n",
 +    //        sym.name.string(), sym.isPublic ? 1 : 0, includePrivate ? 1 : 0,
 +    //        sym.isJavaSymbol ? 1 : 0);
 +    if (!mHavePrivateSymbols) return true;
 +    if (sym.isPublic) return true;
 +    if (includePrivate && sym.isJavaSymbol) return true;
 +    return false;
 +}
 +
  status_t AaptAssets::buildIncludedResources(Bundle* bundle)
  {
      if (!mHaveIncludedAssets) {