Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build.

Browse Source 
At least part of what is broken.  Other stuff still seems to be.

Change-Id: I367dc0377bd5b4e59d9d9b68f3506bf1d64aa591
(cherry picked from commit 32bb5fae35)
This commit is contained in:
Dianne Hackborn
2014-02-11 13:56:21 -08:00
committed by Colin Cross
parent 4e795ebe17
commit d9e385b111
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/androidfw/AssetManager.h
View File

@@ -224,7 +224,7 @@ public:
* corresponding overlay package. * corresponding overlay package.
*/ */
bool createIdmap(const char* targetApkPath, const char* overlayApkPath, 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: private:
struct asset_path struct asset_path

4
include/androidfw/ResourceTypes.h
View File

@@ -1284,7 +1284,7 @@ public:
~ResTable(); ~ResTable();
status_t add(Asset* asset, const int32_t cookie, bool copyData, 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(const void *data, size_t size);
status_t add(ResTable* src); status_t add(ResTable* src);
@@ -1551,7 +1551,7 @@ public:
status_t createIdmap(const ResTable& overlay, status_t createIdmap(const ResTable& overlay,
uint32_t targetCrc, uint32_t overlayCrc, uint32_t targetCrc, uint32_t overlayCrc,
const char* targetPath, const char* overlayPath, const char* targetPath, const char* overlayPath,
void** outData, uint32_t* outSize) const void** outData, size_t* outSize) const
{ {
(void)targetPath; (void)targetPath;
(void)overlayPath; (void)overlayPath;

4
libs/androidfw/AssetManager.cpp
View File

@@ -242,7 +242,7 @@ bool AssetManager::addAssetPath(const String8& path, int32_t* cookie)
} }
bool AssetManager::createIdmap(const char* targetApkPath, const char* overlayApkPath, 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); AutoMutex _l(mLock);
const String8 paths[2] = { String8(targetApkPath), String8(overlayApkPath) }; 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()); ALOGW("failed to find resources.arsc in %s\n", ap.path.string());
return false; return false;
} }
tables[i].add(ass, (void*)1, false); tables[i].add(ass, 1, false);
} }
return tables[0].createIdmap(tables[1], targetCrc, overlayCrc, return tables[0].createIdmap(tables[1], targetCrc, overlayCrc,