diff options
| author | Robert Greenwalt <robdroid@android.com> | 2009-09-03 09:11:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-03 09:11:10 -0700 |
| commit | 1cfe4b2a75041b6853c304eeaee1ae84bbf5f2a8 (patch) | |
| tree | 92b3c32b512290b45971f073076563e38f83fd08 /tools/aapt | |
| parent | 7a1140ee899a9fef550e7a573e44c2d1bd9ad721 (diff) | |
| parent | e8f605ff44664d0ecc9a5a24886176ef447db2a9 (diff) | |
| download | frameworks_base-1cfe4b2a75041b6853c304eeaee1ae84bbf5f2a8.zip frameworks_base-1cfe4b2a75041b6853c304eeaee1ae84bbf5f2a8.tar.gz frameworks_base-1cfe4b2a75041b6853c304eeaee1ae84bbf5f2a8.tar.bz2 | |
am e8f605ff: Merge change 23761 into eclair
Merge commit 'e8f605ff44664d0ecc9a5a24886176ef447db2a9' into eclair-plus-aosp
* commit 'e8f605ff44664d0ecc9a5a24886176ef447db2a9':
Fix compilation of add-resource tag.
Diffstat (limited to 'tools/aapt')
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index f9d2434..3cf6a71 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -984,7 +984,7 @@ status_t compileResourceFile(Bundle* bundle, while ((code=block.next()) != ResXMLTree::END_DOCUMENT && code != ResXMLTree::BAD_DOCUMENT) { if (code == ResXMLTree::END_TAG) { - if (strcmp16(block.getElementName(&len), private_symbols16.string()) == 0) { + if (strcmp16(block.getElementName(&len), add_resource16.string()) == 0) { break; } } |