diff options
| author | Kenny Root <kroot@google.com> | 2010-11-24 12:56:06 -0800 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2010-12-08 11:21:30 -0800 |
| commit | ddb76c4644756b31be948d70aaa8ee541dd94999 (patch) | |
| tree | 782d260d2da982941148be7c1a0a0780749cdfdc /tools | |
| parent | 8028a951c3aa74990907efb9376d1093d84084af (diff) | |
| download | frameworks_base-ddb76c4644756b31be948d70aaa8ee541dd94999.zip frameworks_base-ddb76c4644756b31be948d70aaa8ee541dd94999.tar.gz frameworks_base-ddb76c4644756b31be948d70aaa8ee541dd94999.tar.bz2 | |
Change assets to use 64-bit API
The asset system and supporting libraries were using off_t instead of
off64_t to access files larger than 2GB (32-bit signed). This change
replaces all off_t with off64_t and lseek64.
There is a new utils/Compat.h added for Mac OS compatibility.
Also fixed some size-related compiler warnings.
Bug: 3205336
Change-Id: I9097b3cb7a602e811fe52f245939d8975da55e9e
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/Package.cpp | 2 | ||||
| -rw-r--r-- | tools/aapt/Resource.cpp | 6 | ||||
| -rw-r--r-- | tools/aapt/StringPool.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tools/aapt/Package.cpp b/tools/aapt/Package.cpp index faae89b..ab71f34 100644 --- a/tools/aapt/Package.cpp +++ b/tools/aapt/Package.cpp @@ -461,7 +461,7 @@ ssize_t processJarFiles(Bundle* bundle, ZipFile* zip) ZipFile jar; err = jar.open(jars[i], ZipFile::kOpenReadOnly); if (err != 0) { - fprintf(stderr, "ERROR: unable to open '%s' as a zip file: %zd\n", + fprintf(stderr, "ERROR: unable to open '%s' as a zip file: %d\n", jars[i], err); return err; } diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp index 7b74506..4614d6f 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 %d has flavor %s\n", i, + printf("baseFile %zd has flavor %s\n", i, baseFiles.keyAt(i).toString().string()); } for (size_t i=0; i < overlayFiles.size(); i++) { - printf("overlayFile %d has flavor %s\n", i, + printf("overlayFile %zd 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 (%d) for overlay file %s, for flavor %s\n", + printf("found a match (%zd) for overlay file %s, for flavor %s\n", baseFileIndex, overlayGroup->getLeaf().string(), overlayFiles.keyAt(overlayGroupIndex).toString().string()); diff --git a/tools/aapt/StringPool.cpp b/tools/aapt/StringPool.cpp index e28bdff..d067d59 100644 --- a/tools/aapt/StringPool.cpp +++ b/tools/aapt/StringPool.cpp @@ -30,7 +30,7 @@ void printStringPool(const ResStringPool* pool) str = String8(pool->stringAt(s, &len)).string(); } - printf("String #%d: %s\n", s, str); + printf("String #%zd: %s\n", s, str); } } |