Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c205a9d6: am f8aea993: Make aapt ignore tools-related data.

Browse Source 
* commit 'c205a9d68c23e9ade2cbe28bba0f257d84d23a97':
  Make aapt ignore tools-related data.
This commit is contained in:
Xavier Ducrohet
2012-02-06 11:42:50 -08:00
committed by Android Git Automerger
parent 1e148f509e c205a9d68c
commit 3d4db0dc18
1 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/aapt/XMLNode.cpp
View File

@@ -45,6 +45,7 @@ bool isWhitespace(const char16_t* str)
static const String16 RESOURCES_PREFIX(RESOURCES_ROOT_NAMESPACE); static const String16 RESOURCES_PREFIX(RESOURCES_ROOT_NAMESPACE);
static const String16 RESOURCES_PRV_PREFIX(RESOURCES_ROOT_PRV_NAMESPACE); static const String16 RESOURCES_PRV_PREFIX(RESOURCES_ROOT_PRV_NAMESPACE);
static const String16 RESOURCES_TOOLS_NAMESPACE("http://schemas.android.com/tools");
String16 getNamespaceResourcePackage(String16 namespaceUri, bool* outIsPublic) String16 getNamespaceResourcePackage(String16 namespaceUri, bool* outIsPublic)
{ {
@@ -761,6 +762,8 @@ status_t XMLNode::addAttribute(const String16& ns, const String16& name,
SourcePos(mFilename, getStartLineNumber()).error("Child to CDATA node."); SourcePos(mFilename, getStartLineNumber()).error("Child to CDATA node.");
return UNKNOWN_ERROR; return UNKNOWN_ERROR;
} }
if (ns != RESOURCES_TOOLS_NAMESPACE) {
attribute_entry e; attribute_entry e;
e.index = mNextAttributeIndex++; e.index = mNextAttributeIndex++;
e.ns = ns; e.ns = ns;
@@ -768,6 +771,7 @@ status_t XMLNode::addAttribute(const String16& ns, const String16& name,
e.string = value; e.string = value;
mAttributes.add(e); mAttributes.add(e);
mAttributeOrder.add(e.index, mAttributes.size()-1); mAttributeOrder.add(e.index, mAttributes.size()-1);
}
return NO_ERROR; return NO_ERROR;
} }
@@ -1215,12 +1219,14 @@ status_t XMLNode::collect_strings(StringPool* dest, Vector<uint32_t>* outResIds,
collect_attr_strings(dest, outResIds, true); collect_attr_strings(dest, outResIds, true);
int i; int i;
if (RESOURCES_TOOLS_NAMESPACE != mNamespaceUri) {
if (mNamespacePrefix.size() > 0) { if (mNamespacePrefix.size() > 0) {
dest->add(mNamespacePrefix, true); dest->add(mNamespacePrefix, true);
} }
if (mNamespaceUri.size() > 0) { if (mNamespaceUri.size() > 0) {
dest->add(mNamespaceUri, true); dest->add(mNamespaceUri, true);
} }
}
if (mElementName.size() > 0) { if (mElementName.size() > 0) {
dest->add(mElementName, true); dest->add(mElementName, true);
} }
@@ -1338,6 +1344,7 @@ status_t XMLNode::flatten_node(const StringPool& strings, const sp<AaptFile>& de
const void* extData = NULL; const void* extData = NULL;
size_t extSize = 0; size_t extSize = 0;
ResXMLTree_attribute attr; ResXMLTree_attribute attr;
bool writeCurrentNode = true;
const size_t NA = mAttributes.size(); const size_t NA = mAttributes.size();
const size_t NC = mChildren.size(); const size_t NC = mChildren.size();
@@ -1395,6 +1402,9 @@ status_t XMLNode::flatten_node(const StringPool& strings, const sp<AaptFile>& de
} }
} }
} else if (type == TYPE_NAMESPACE) { } else if (type == TYPE_NAMESPACE) {
if (mNamespaceUri == RESOURCES_TOOLS_NAMESPACE) {
writeCurrentNode = false;
} else {
node.header.type = htods(RES_XML_START_NAMESPACE_TYPE); node.header.type = htods(RES_XML_START_NAMESPACE_TYPE);
extData = &namespaceExt; extData = &namespaceExt;
extSize = sizeof(namespaceExt); extSize = sizeof(namespaceExt);
@@ -1406,6 +1416,7 @@ status_t XMLNode::flatten_node(const StringPool& strings, const sp<AaptFile>& de
} }
namespaceExt.prefix.index = htodl(strings.offsetForString(mNamespacePrefix)); namespaceExt.prefix.index = htodl(strings.offsetForString(mNamespacePrefix));
namespaceExt.uri.index = htodl(strings.offsetForString(mNamespaceUri)); namespaceExt.uri.index = htodl(strings.offsetForString(mNamespaceUri));
}
LOG_ALWAYS_FATAL_IF(NA != 0, "Namespace nodes can't have attributes!"); LOG_ALWAYS_FATAL_IF(NA != 0, "Namespace nodes can't have attributes!");
} else if (type == TYPE_CDATA) { } else if (type == TYPE_CDATA) {
node.header.type = htods(RES_XML_CDATA_TYPE); node.header.type = htods(RES_XML_CDATA_TYPE);
@@ -1422,10 +1433,12 @@ status_t XMLNode::flatten_node(const StringPool& strings, const sp<AaptFile>& de
node.header.size = htodl(sizeof(node) + extSize + (sizeof(attr)*NA)); node.header.size = htodl(sizeof(node) + extSize + (sizeof(attr)*NA));
if (writeCurrentNode) {
dest->writeData(&node, sizeof(node)); dest->writeData(&node, sizeof(node));
if (extSize > 0) { if (extSize > 0) {
dest->writeData(extData, extSize); dest->writeData(extData, extSize);
} }
}
for (i=0; i<NA; i++) { for (i=0; i<NA; i++) {
ssize_t idx = mAttributeOrder.valueAt(i); ssize_t idx = mAttributeOrder.valueAt(i);
@@ -1476,6 +1489,7 @@ status_t XMLNode::flatten_node(const StringPool& strings, const sp<AaptFile>& de
dest->writeData(&node, sizeof(node)); dest->writeData(&node, sizeof(node));
dest->writeData(&endElementExt, sizeof(endElementExt)); dest->writeData(&endElementExt, sizeof(endElementExt));
} else if (type == TYPE_NAMESPACE) { } else if (type == TYPE_NAMESPACE) {
if (writeCurrentNode) {
node.header.type = htods(RES_XML_END_NAMESPACE_TYPE); node.header.type = htods(RES_XML_END_NAMESPACE_TYPE);
node.lineNumber = htodl(getEndLineNumber()); node.lineNumber = htodl(getEndLineNumber());
node.comment.index = htodl((uint32_t)-1); node.comment.index = htodl((uint32_t)-1);
@@ -1483,6 +1497,7 @@ status_t XMLNode::flatten_node(const StringPool& strings, const sp<AaptFile>& de
dest->writeData(&node, sizeof(node)); dest->writeData(&node, sizeof(node));
dest->writeData(extData, extSize); dest->writeData(extData, extSize);
} }
}
return NO_ERROR; return NO_ERROR;
} }