diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-02-11 13:56:21 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@google.com> | 2014-02-11 22:47:42 +0000 |
| commit | d9e385b111ebf811beb0f29178a2fbd4d667509f (patch) | |
| tree | 99be89e7fadb00b002536146ee76ac5d415c5a3d | |
| parent | 4e795ebe1783623a28a988f77b4f0f11d54e73be (diff) | |
| download | frameworks_base-d9e385b111ebf811beb0f29178a2fbd4d667509f.zip frameworks_base-d9e385b111ebf811beb0f29178a2fbd4d667509f.tar.gz frameworks_base-d9e385b111ebf811beb0f29178a2fbd4d667509f.tar.bz2 | |
Fix build.
At least part of what is broken. Other stuff still seems to be.
Change-Id: I367dc0377bd5b4e59d9d9b68f3506bf1d64aa591
(cherry picked from commit 32bb5fae353b5bb6275e75952e89c514c7369cee)
| -rw-r--r-- | include/androidfw/AssetManager.h | 2 | ||||
| -rw-r--r-- | include/androidfw/ResourceTypes.h | 4 | ||||
| -rw-r--r-- | libs/androidfw/AssetManager.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/androidfw/AssetManager.h b/include/androidfw/AssetManager.h index e0c6183..503377c 100644 --- a/include/androidfw/AssetManager.h +++ b/include/androidfw/AssetManager.h @@ -224,7 +224,7 @@ public: * corresponding overlay package. */ bool 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); private: struct asset_path diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h index 7779f7f..d921573 100644 --- a/include/androidfw/ResourceTypes.h +++ b/include/androidfw/ResourceTypes.h @@ -1284,7 +1284,7 @@ public: ~ResTable(); status_t add(Asset* asset, const int32_t cookie, bool copyData, - const void* idmap); + const void* idmap = NULL); status_t add(const void *data, size_t size); status_t add(ResTable* src); @@ -1551,7 +1551,7 @@ public: status_t createIdmap(const ResTable& overlay, uint32_t targetCrc, uint32_t overlayCrc, const char* targetPath, const char* overlayPath, - void** outData, uint32_t* outSize) const + void** outData, size_t* outSize) const { (void)targetPath; (void)overlayPath; diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp index 251d47b..058126f 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, |