summaryrefslogtreecommitdiffstats
path: root/tools/aapt/Resource.cpp
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-02-24 20:00:03 -0800
committerKenny Root <kroot@google.com>2010-02-24 20:03:17 -0800
commit5a8ec761213d723fc3a6a92250e5e855605046a6 (patch)
tree2b9d6b08297b36efacdf8bdf21c1da8d763e9657 /tools/aapt/Resource.cpp
parent406b09bbd117446814a05aabc5971fd55c6afa5d (diff)
downloadframeworks_base-5a8ec761213d723fc3a6a92250e5e855605046a6.zip
frameworks_base-5a8ec761213d723fc3a6a92250e5e855605046a6.tar.gz
frameworks_base-5a8ec761213d723fc3a6a92250e5e855605046a6.tar.bz2
Scan for android namespace in manifest
android:minSdkVersion wasn't being correctly scanned because the namespace was incorrect. This fixes that problem so packages aren't generated as UTF-8 when minSdkVersion is less than 7. Change-Id: I8f45d47ea886915da6a4770f6e111e6085d61bee
Diffstat (limited to 'tools/aapt/Resource.cpp')
-rw-r--r--tools/aapt/Resource.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp
index 88c5441..f8c5c38 100644
--- a/tools/aapt/Resource.cpp
+++ b/tools/aapt/Resource.cpp
@@ -221,12 +221,12 @@ static status_t parsePackage(Bundle* bundle, const sp<AaptAssets>& assets,
&& code != ResXMLTree::BAD_DOCUMENT) {
if (code == ResXMLTree::START_TAG) {
if (strcmp16(block.getElementName(&len), uses_sdk16.string()) == 0) {
- ssize_t minSdkIndex = block.indexOfAttribute("android",
+ ssize_t minSdkIndex = block.indexOfAttribute(RESOURCES_ANDROID_NAMESPACE,
"minSdkVersion");
if (minSdkIndex >= 0) {
String8 minSdkString = String8(
block.getAttributeStringValue(minSdkIndex, &len));
- bundle->setMinSdkVersion(minSdkString.string());
+ bundle->setMinSdkVersion(minSdkString.string());
}
}
}