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

am 54e7f53f: Merge "Fix build."

Browse Source 
* commit '54e7f53fce25366781840a124aa018534c4eb52b':
  Fix build.
This commit is contained in:
Narayan Kamath
2014-02-12 09:29:55 -08:00
committed by Android Git Automerger
parent 75d67c6aa0 54e7f53fce
commit 8fa3f44342
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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);
@@ -1548,7 +1548,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;
enum { enum {
IDMAP_HEADER_SIZE_BYTES = 3 * sizeof(uint32_t) + 2 * 256, IDMAP_HEADER_SIZE_BYTES = 3 * sizeof(uint32_t) + 2 * 256,