From: Jean-Baptiste Queru <jbq@google.com>
Date: Tue, 1 May 2012 17:00:22 +0000 (-0700)
Subject: resolved conflicts for merge of 13c04786 to jb-dev-plus-aosp
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/49a9bf69364a9a501259785d47b9a4ac30e341eb?ds=inline;hp=-c

resolved conflicts for merge of 13c04786 to jb-dev-plus-aosp

Change-Id: Ib7aa5a768f4606beb2a4387811cfed7c00cbc111
---

49a9bf69364a9a501259785d47b9a4ac30e341eb
diff --combined ResourceTable.cpp
index 22b75d8,770b027..d98fe65
--- a/ResourceTable.cpp
+++ b/ResourceTable.cpp
@@@ -9,8 -9,8 +9,8 @@@
  #include "XMLNode.h"
  #include "ResourceFilter.h"
  
 +#include <androidfw/ResourceTypes.h>
  #include <utils/ByteOrder.h>
 -#include <utils/ResourceTypes.h>
  #include <stdarg.h>
  
  #define NOISY(x) //x
@@@ -753,7 -753,6 +753,7 @@@ status_t compileResourceFile(Bundle* bu
      const String16 public16("public");
      const String16 public_padding16("public-padding");
      const String16 private_symbols16("private-symbols");
 +    const String16 java_symbol16("java-symbol");
      const String16 add_resource16("add-resource");
      const String16 skip16("skip");
      const String16 eat_comment16("eat-comment");
@@@ -1059,49 -1058,6 +1059,49 @@@
                  }
                  continue;
  
 +            } else if (strcmp16(block.getElementName(&len), java_symbol16.string()) == 0) {
 +                SourcePos srcPos(in->getPrintableSource(), block.getLineNumber());
 +            
 +                String16 type;
 +                ssize_t typeIdx = block.indexOfAttribute(NULL, "type");
 +                if (typeIdx < 0) {
 +                    srcPos.error("A 'type' attribute is required for <public>\n");
 +                    hasErrors = localHasErrors = true;
 +                }
 +                type = String16(block.getAttributeStringValue(typeIdx, &len));
 +
 +                String16 name;
 +                ssize_t nameIdx = block.indexOfAttribute(NULL, "name");
 +                if (nameIdx < 0) {
 +                    srcPos.error("A 'name' attribute is required for <public>\n");
 +                    hasErrors = localHasErrors = true;
 +                }
 +                name = String16(block.getAttributeStringValue(nameIdx, &len));
 +
 +                sp<AaptSymbols> symbols = assets->getJavaSymbolsFor(String8("R"));
 +                if (symbols != NULL) {
 +                    symbols = symbols->addNestedSymbol(String8(type), srcPos);
 +                }
 +                if (symbols != NULL) {
 +                    symbols->makeSymbolJavaSymbol(String8(name), srcPos);
 +                    String16 comment(
 +                        block.getComment(&len) ? block.getComment(&len) : nulStr);
 +                    symbols->appendComment(String8(name), comment, srcPos);
 +                } else {
 +                    srcPos.error("Unable to create symbols!\n");
 +                    hasErrors = localHasErrors = true;
 +                }
 +
 +                while ((code=block.next()) != ResXMLTree::END_DOCUMENT && code != ResXMLTree::BAD_DOCUMENT) {
 +                    if (code == ResXMLTree::END_TAG) {
 +                        if (strcmp16(block.getElementName(&len), java_symbol16.string()) == 0) {
 +                            break;
 +                        }
 +                    }
 +                }
 +                continue;
 +
 +
              } else if (strcmp16(block.getElementName(&len), add_resource16.string()) == 0) {
                  SourcePos srcPos(in->getPrintableSource(), block.getLineNumber());
              
@@@ -2091,8 -2047,7 +2091,8 @@@ bool ResourceTable::stringToValue(Res_v
                                    uint32_t attrID,
                                    const Vector<StringPool::entry_style_span>* style,
                                    String16* outStr, void* accessorCookie,
 -                                  uint32_t attrType)
 +                                  uint32_t attrType, const String8* configTypeName,
 +                                  const ConfigDescription* config)
  {
      String16 finalStr;
  
@@@ -2120,19 -2075,10 +2120,19 @@@
      if (outValue->dataType == outValue->TYPE_STRING) {
          // Should do better merging styles.
          if (pool) {
 +            String8 configStr;
 +            if (config != NULL) {
 +                configStr = config->toString();
 +            } else {
 +                configStr = "(null)";
 +            }
 +            NOISY(printf("Adding to pool string style #%d config %s: %s\n",
 +                    style != NULL ? style->size() : 0,
 +                    configStr.string(), String8(finalStr).string()));
              if (style != NULL && style->size() > 0) {
 -                outValue->data = pool->add(finalStr, *style);
 +                outValue->data = pool->add(finalStr, *style, configTypeName, config);
              } else {
 -                outValue->data = pool->add(finalStr, true);
 +                outValue->data = pool->add(finalStr, true, configTypeName, config);
              }
          } else {
              // Caller will fill this in later.
@@@ -2304,8 -2250,10 +2304,8 @@@ bool ResourceTable::getAttributeFlags
  
          const char16_t* end = name + nameLen;
          const char16_t* pos = name;
 -        bool failed = false;
 -        while (pos < end && !failed) {
 +        while (pos < end) {
              const char16_t* start = pos;
 -            end++;
              while (pos < end && *pos != '|') {
                  pos++;
              }
@@@ -2331,7 -2279,9 +2331,7 @@@
                  // Didn't find this flag identifier.
                  return false;
              }
 -            if (pos < end) {
 -                pos++;
 -            }
 +            pos++;
          }
  
          return true;
@@@ -2587,19 -2537,16 +2587,19 @@@ status_t ResourceTable::flatten(Bundle
          return err;
      }
  
 +    const ConfigDescription nullConfig;
 +
      const size_t N = mOrderedPackages.size();
      size_t pi;
  
      const static String16 mipmap16("mipmap");
  
 -    bool useUTF8 = !bundle->getWantUTF16() && bundle->isMinSdkAtLeast(SDK_FROYO);
 +    bool useUTF8 = !bundle->getUTF16StringsOption();
  
      // Iterate through all data, collecting all values (strings,
      // references, etc).
 -    StringPool valueStrings = StringPool(false, useUTF8);
 +    StringPool valueStrings(useUTF8);
 +    Vector<sp<Entry> > allEntries;
      for (pi=0; pi<N; pi++) {
          sp<Package> p = mOrderedPackages.itemAt(pi);
          if (p->getTypes().size() == 0) {
@@@ -2607,8 -2554,8 +2607,8 @@@
              continue;
          }
  
 -        StringPool typeStrings = StringPool(false, useUTF8);
 -        StringPool keyStrings = StringPool(false, useUTF8);
 +        StringPool typeStrings(useUTF8);
 +        StringPool keyStrings(useUTF8);
  
          const size_t N = p->getOrderedTypes().size();
          for (size_t ti=0; ti<N; ti++) {
@@@ -2620,19 -2567,6 +2620,19 @@@
              const String16 typeName(t->getName());
              typeStrings.add(typeName, false);
  
 +            // This is a hack to tweak the sorting order of the final strings,
 +            // to put stuff that is generally not language-specific first.
 +            String8 configTypeName(typeName);
 +            if (configTypeName == "drawable" || configTypeName == "layout"
 +                    || configTypeName == "color" || configTypeName == "anim"
 +                    || configTypeName == "interpolator" || configTypeName == "animator"
 +                    || configTypeName == "xml" || configTypeName == "menu"
 +                    || configTypeName == "mipmap" || configTypeName == "raw") {
 +                configTypeName = "1complex";
 +            } else {
 +                configTypeName = "2value";
 +            }
 +
              const bool filterable = (typeName != mipmap16);
  
              const size_t N = t->getOrderedConfigs().size();
@@@ -2652,21 -2586,10 +2652,21 @@@
                          continue;
                      }
                      e->setNameIndex(keyStrings.add(e->getName(), true));
 -                    status_t err = e->prepareFlatten(&valueStrings, this);
 +
 +                    // If this entry has no values for other configs,
 +                    // and is the default config, then it is special.  Otherwise
 +                    // we want to add it with the config info.
 +                    ConfigDescription* valueConfig = NULL;
 +                    if (N != 1 || config == nullConfig) {
 +                        valueConfig = &config;
 +                    }
 +
 +                    status_t err = e->prepareFlatten(&valueStrings, this,
 +                            &configTypeName, &config);
                      if (err != NO_ERROR) {
                          return err;
                      }
 +                    allEntries.add(e);
                  }
              }
          }
@@@ -2675,17 -2598,6 +2675,17 @@@
          p->setKeyStrings(keyStrings.createStringBlock());
      }
  
 +    if (bundle->getOutputAPKFile() != NULL) {
 +        // Now we want to sort the value strings for better locality.  This will
 +        // cause the positions of the strings to change, so we need to go back
 +        // through out resource entries and update them accordingly.  Only need
 +        // to do this if actually writing the output file.
 +        valueStrings.sortByConfig();
 +        for (pi=0; pi<allEntries.size(); pi++) {
 +            allEntries[pi]->remapStringValue(&valueStrings);
 +        }
 +    }
 +
      ssize_t strAmt = 0;
      
      // Now build the array of package chunks.
@@@ -2749,6 -2661,12 +2749,12 @@@
              const bool filterable = (typeName != mipmap16);
  
              const size_t N = t != NULL ? t->getOrderedConfigs().size() : 0;
+ 
+             // Until a non-NO_ENTRY value has been written for a resource,
+             // that resource is invalid; validResources[i] represents
+             // the item at t->getOrderedConfigs().itemAt(i).
+             Vector<bool> validResources;
+             validResources.insertAt(false, 0, N);
              
              // First write the typeSpec chunk, containing information about
              // each resource entry in this type.
@@@ -2885,6 -2803,7 +2891,7 @@@
                          if (amt < 0) {
                              return amt;
                          }
+                         validResources.editItemAt(ei) = true;
                      } else {
                          index[ei] = htodl(ResTable_type::NO_ENTRY);
                      }
@@@ -2895,6 -2814,14 +2902,14 @@@
                      (((uint8_t*)data->editData()) + typeStart);
                  tHeader->header.size = htodl(data->getSize()-typeStart);
              }
+ 
+             for (size_t i = 0; i < N; ++i) {
+                 if (!validResources[i]) {
+                     sp<ConfigList> c = t->getOrderedConfigs().itemAt(i);
+                     fprintf(stderr, "warning: no entries written for %s/%s\n",
+                             String8(typeName).string(), String8(c->getName()).string());
+                 }
+             }
          }
  
          // Fill in the rest of the package information.
@@@ -3225,16 -3152,14 +3240,16 @@@ status_t ResourceTable::Entry::assignRe
      return hasErrors ? UNKNOWN_ERROR : NO_ERROR;
  }
  
 -status_t ResourceTable::Entry::prepareFlatten(StringPool* strings, ResourceTable* table)
 +status_t ResourceTable::Entry::prepareFlatten(StringPool* strings, ResourceTable* table,
 +        const String8* configTypeName, const ConfigDescription* config)
  {
      if (mType == TYPE_ITEM) {
          Item& it = mItem;
          AccessorCookie ac(it.sourcePos, String8(mName), String8(it.value));
          if (!table->stringToValue(&it.parsedValue, strings,
                                    it.value, false, true, 0,
 -                                  &it.style, NULL, &ac, mItemFormat)) {
 +                                  &it.style, NULL, &ac, mItemFormat,
 +                                  configTypeName, config)) {
              return UNKNOWN_ERROR;
          }
      } else if (mType == TYPE_BAG) {
@@@ -3245,8 -3170,7 +3260,8 @@@
              AccessorCookie ac(it.sourcePos, String8(key), String8(it.value));
              if (!table->stringToValue(&it.parsedValue, strings,
                                        it.value, false, true, it.bagKeyId,
 -                                      &it.style, NULL, &ac, it.format)) {
 +                                      &it.style, NULL, &ac, it.format,
 +                                      configTypeName, config)) {
                  return UNKNOWN_ERROR;
              }
          }
@@@ -3258,29 -3182,6 +3273,29 @@@
      return NO_ERROR;
  }
  
 +status_t ResourceTable::Entry::remapStringValue(StringPool* strings)
 +{
 +    if (mType == TYPE_ITEM) {
 +        Item& it = mItem;
 +        if (it.parsedValue.dataType == Res_value::TYPE_STRING) {
 +            it.parsedValue.data = strings->mapOriginalPosToNewPos(it.parsedValue.data);
 +        }
 +    } else if (mType == TYPE_BAG) {
 +        const size_t N = mBag.size();
 +        for (size_t i=0; i<N; i++) {
 +            Item& it = mBag.editValueAt(i);
 +            if (it.parsedValue.dataType == Res_value::TYPE_STRING) {
 +                it.parsedValue.data = strings->mapOriginalPosToNewPos(it.parsedValue.data);
 +            }
 +        }
 +    } else {
 +        mPos.error("Error: entry %s is not a single item or a bag.\n",
 +                   String8(mName).string());
 +        return UNKNOWN_ERROR;
 +    }
 +    return NO_ERROR;
 +}
 +
  ssize_t ResourceTable::Entry::flatten(Bundle* bundle, const sp<AaptFile>& data, bool isPublic)
  {
      size_t amt = 0;