diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-02-11 13:56:21 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2014-02-11 14:22:14 -0800 |
| commit | 32bb5fae353b5bb6275e75952e89c514c7369cee (patch) | |
| tree | e1cb0e8fbdd8c7aa03f1971e4a55da7f8e6d7b68 /libs/androidfw/AssetManager.cpp | |
| parent | 6adfd86ca94f3eabb93fb1b4a0b9b0ea50895dcd (diff) | |
| download | frameworks_base-32bb5fae353b5bb6275e75952e89c514c7369cee.zip frameworks_base-32bb5fae353b5bb6275e75952e89c514c7369cee.tar.gz frameworks_base-32bb5fae353b5bb6275e75952e89c514c7369cee.tar.bz2 | |
Fix build.
At least part of what is broken. Other stuff still seems to be.
Change-Id: I367dc0377bd5b4e59d9d9b68f3506bf1d64aa591
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
| -rw-r--r-- | libs/androidfw/AssetManager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp index aa69d2f..a24a8b3 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -242,7 +242,7 @@ bool AssetManager::addAssetPath(const String8& path, int32_t* cookie) } bool AssetManager::createIdmap(const char* targetApkPath, const char* overlayApkPath, - uint32_t targetCrc, uint32_t overlayCrc, uint32_t** outData, uint32_t* outSize) + uint32_t targetCrc, uint32_t overlayCrc, uint32_t** outData, size_t* outSize) { AutoMutex _l(mLock); const String8 paths[2] = { String8(targetApkPath), String8(overlayApkPath) }; @@ -257,7 +257,7 @@ bool AssetManager::createIdmap(const char* targetApkPath, const char* overlayApk ALOGW("failed to find resources.arsc in %s\n", ap.path.string()); return false; } - tables[i].add(ass, (void*)1, false); + tables[i].add(ass, 1, false); } return tables[0].createIdmap(tables[1], targetCrc, overlayCrc, |