diff options
| author | Elliott Hughes <enh@google.com> | 2013-03-13 20:54:01 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-03-13 20:54:01 -0700 |
| commit | ddd286301b466b5cd10cfcdc0a5ee5729ef2e385 (patch) | |
| tree | 68489358ea22ecdf5dff009742227c8dbd77d3c0 | |
| parent | d8151306f539f8c2f3b66c1fe06be9566ba8aca3 (diff) | |
| download | frameworks_native-ddd286301b466b5cd10cfcdc0a5ee5729ef2e385.zip frameworks_native-ddd286301b466b5cd10cfcdc0a5ee5729ef2e385.tar.gz frameworks_native-ddd286301b466b5cd10cfcdc0a5ee5729ef2e385.tar.bz2 | |
Second try at adding a compatibility symbol for the MemoryBase constructor.
Third-party libraries are currently trying to use the
MemoryBase constructor but failing because we fixed the
definition of ssize_t. This is a stop-gap for users of
this private API until we can get them fixed.
Bug: 8253769
Change-Id: Ie7c86f45fa39cb53539cab0ffe8585a585656714
| -rw-r--r-- | libs/binder/MemoryBase.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libs/binder/MemoryBase.cpp b/libs/binder/MemoryBase.cpp index 033066b..5c82330 100644 --- a/libs/binder/MemoryBase.cpp +++ b/libs/binder/MemoryBase.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#define LOG_TAG "MemoryBase" #include <stdlib.h> #include <stdint.h> @@ -44,3 +45,11 @@ MemoryBase::~MemoryBase() // --------------------------------------------------------------------------- }; // namespace android + +// Backwards compatibility for libdatabase_sqlcipher (http://b/8253769). +extern "C" void _ZN7android10MemoryBaseC1ERKNS_2spINS_11IMemoryHeapEEEij(void*, void*, ssize_t, size_t); +extern "C" void _ZN7android10MemoryBaseC1ERKNS_2spINS_11IMemoryHeapEEElj(void* obj, void* h, long o, unsigned int size) { + _ZN7android10MemoryBaseC1ERKNS_2spINS_11IMemoryHeapEEEij(obj, h, o, size); + ALOGW("Using temporary compatibility workaround for usage of MemoryBase " + "private API. Please fix your application!"); +} |