diff options
| author | Elliott Hughes <enh@google.com> | 2013-03-14 10:31:38 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2013-03-14 15:12:53 -0700 |
| commit | 284414bf4f1a6a649b2177286d473e4d3626631f (patch) | |
| tree | 6ded8cd3c8e4c9f99714654dd031348383fe5eb5 | |
| parent | 484229c742908fcf2f439f5dd3678f65de4d6a25 (diff) | |
| download | frameworks_native-284414bf4f1a6a649b2177286d473e4d3626631f.zip frameworks_native-284414bf4f1a6a649b2177286d473e4d3626631f.tar.gz frameworks_native-284414bf4f1a6a649b2177286d473e4d3626631f.tar.bz2 | |
am 7212ff29: am 20e154f1: Merge "Second try at adding a compatibility symbol for the MemoryBase constructor."
* commit '7212ff29c6f4e4cd192fee6f072e80b36d8a728b':
Second try at adding a compatibility symbol for the MemoryBase constructor.
| -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!"); +} |