diff options
author | Steve Block <steveblock@google.com> | 2010-06-14 17:34:04 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2010-06-25 11:02:15 +0100 |
commit | f1ff21ac62a51f5ba8ca0821ea8a90f70957e25d (patch) | |
tree | 93b20482d80f3008a887e0c89eaa9a7cd3ad61ca /tools/aapt/Resource.cpp | |
parent | b5c49c8bb1e830ba934c7fbceec9409b89ead4a9 (diff) | |
download | frameworks_base-f1ff21ac62a51f5ba8ca0821ea8a90f70957e25d.zip frameworks_base-f1ff21ac62a51f5ba8ca0821ea8a90f70957e25d.tar.gz frameworks_base-f1ff21ac62a51f5ba8ca0821ea8a90f70957e25d.tar.bz2 |
Fixes a few minor problems with AAPT
- Fixes casting problems with stricter compilers
- Adds a couple of missing ifdef guards
This is a first step toward being able to generate APKs on the fly on the device.
Bug: 2766918
Change-Id: Icaaee5a4032afa313256add321b447443861dd85
Diffstat (limited to 'tools/aapt/Resource.cpp')
-rw-r--r-- | tools/aapt/Resource.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp index cafd635..5855b56 100644 --- a/tools/aapt/Resource.cpp +++ b/tools/aapt/Resource.cpp @@ -542,11 +542,11 @@ static bool applyFileOverlay(Bundle *bundle, DefaultKeyedVector<AaptGroupEntry, sp<AaptFile> > baseFiles = baseGroup->getFiles(); for (size_t i=0; i < baseFiles.size(); i++) { - printf("baseFile %ld has flavor %s\n", i, + printf("baseFile %d has flavor %s\n", i, baseFiles.keyAt(i).toString().string()); } for (size_t i=0; i < overlayFiles.size(); i++) { - printf("overlayFile %ld has flavor %s\n", i, + printf("overlayFile %d has flavor %s\n", i, overlayFiles.keyAt(i).toString().string()); } } @@ -560,7 +560,7 @@ static bool applyFileOverlay(Bundle *bundle, keyAt(overlayGroupIndex)); if(baseFileIndex < UNKNOWN_ERROR) { if (bundle->getVerbose()) { - printf("found a match (%ld) for overlay file %s, for flavor %s\n", + printf("found a match (%d) for overlay file %s, for flavor %s\n", baseFileIndex, overlayGroup->getLeaf().string(), overlayFiles.keyAt(overlayGroupIndex).toString().string()); |