diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-02-11 13:56:21 -0800 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-02-12 10:11:34 +0000 |
| commit | 4385d37813897be979ff13262bc464979c74e3dd (patch) | |
| tree | 96a45d931fc70ae774e7532f8117515ebece3708 /include/androidfw | |
| parent | f991771f81953f5d355eb905d05a784ed7287016 (diff) | |
| download | frameworks_base-4385d37813897be979ff13262bc464979c74e3dd.zip frameworks_base-4385d37813897be979ff13262bc464979c74e3dd.tar.gz frameworks_base-4385d37813897be979ff13262bc464979c74e3dd.tar.bz2 | |
Fix build.
At least part of what is broken. Other stuff still seems to be.
(cherry picked from 32bb5fae353b5bb6275e75952e89c514c7369cee)
Change-Id: I280376645166fe772ff7a31ff2e8494dce2adbf8
Diffstat (limited to 'include/androidfw')
| -rw-r--r-- | include/androidfw/ResourceTypes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h index c022818..05411ea 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); @@ -1548,7 +1548,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; enum { IDMAP_HEADER_SIZE_BYTES = 3 * sizeof(uint32_t) + 2 * 256, |