kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[android] Copy only compressed files from apk - e.g. *.mwm and *.ttf.

Browse source 
@note don't forget to update aapt script in sdk/platform/tools from tools/android/aapt
This commit is contained in:
Alex Zolotarev 2012-02-26 16:47:09 +03:00 • committed by Alex Zolotarev
parent a93e98ae26
commit fe13a2fab6
2 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
android/jni/com/mapswithme/maps/CopyResourcesActivity.cpp
View file

@ -54,29 +54,36 @@ extern "C"
}
jint totalSizeToCopy = 0;
// Get files to copy from apk assets folder
string const ASSETS_PREFIX = "assets/";
Platform::FilesList zipFiles = ZipFileReader::FilesList(g_apkPath);
// Leave only assets/* files and check that all files from apk are copied on the sdcard
for (Platform::FilesList::iterator it = zipFiles.begin(); it != zipFiles.end();)
// Check which assets/* files are compressed and copy only these files
string const ASSETS_PREFIX = "assets/";
for (Platform::FilesList::iterator it = zipFiles.begin(); it != zipFiles.end(); ++it)
{
// Ignore non-assets files
if (it->find(ASSETS_PREFIX) != 0)
it = zipFiles.erase(it);
else
{
FileToCopy f;
f.m_pathInZip = *it;
f.m_pathInSdcard = g_sdcardPath + it->substr(ASSETS_PREFIX.size());
f.m_uncompressedSize = ZipFileReader(g_apkPath, *it).UncompressedSize();
continue;
uint64_t realSizeInSdcard = 0;
Platform::GetFileSizeByFullPath(f.m_pathInSdcard, realSizeInSdcard);
if (f.m_uncompressedSize != realSizeInSdcard)
{
g_filesToCopy.push_back(f);
totalSizeToCopy += f.m_uncompressedSize;
}
++it;
uint64_t compressed, uncompressed;
{
ZipFileReader fileInZip(g_apkPath, *it);
compressed = fileInZip.Size();
uncompressed = fileInZip.UncompressedSize();
// Skip files which are not compressed inside zip
if (compressed == uncompressed)
continue;
}
FileToCopy f;
f.m_pathInSdcard = g_sdcardPath + it->substr(ASSETS_PREFIX.size());
uint64_t realSizeInSdcard = 0;
Platform::GetFileSizeByFullPath(f.m_pathInSdcard, realSizeInSdcard);
if (uncompressed != realSizeInSdcard)
{
f.m_pathInZip = *it;
f.m_uncompressedSize = uncompressed;
g_filesToCopy.push_back(f);
totalSizeToCopy += uncompressed;
}
}

2
tools/android/aapt
View file

@ -6,4 +6,4 @@
# Main purpose is transparently disable compression
# for given file types inside .zip (.apk) file
${0}2 $@ -0 mwm -0 txt -0 bin -0 skn -0 slf -0 html -0 png -0 ttf
${0}2 "$@" -0 txt -0 bin -0 skn -0 html -0 png