diff options
author | Elliott Hughes <enh@google.com> | 2013-07-09 22:15:42 +0000 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2013-07-09 22:15:42 +0000 |
commit | 2dccfdcd265ca86cca5ac863d921e5c647b93073 (patch) | |
tree | e0ab70f40b9dae2791fec8de3602d8bee86603c0 /libs/binder/MemoryBase.cpp | |
parent | ddd286301b466b5cd10cfcdc0a5ee5729ef2e385 (diff) | |
download | frameworks_native-2dccfdcd265ca86cca5ac863d921e5c647b93073.zip frameworks_native-2dccfdcd265ca86cca5ac863d921e5c647b93073.tar.gz frameworks_native-2dccfdcd265ca86cca5ac863d921e5c647b93073.tar.bz2 |
Revert "Second try at adding a compatibility symbol for the MemoryBase constructor."
This reverts commit ddd286301b466b5cd10cfcdc0a5ee5729ef2e385, because the third-party library in question has now been fixed.
Change-Id: Ic195a913f90b36268ed9d6e60be520decb4e198d
Diffstat (limited to 'libs/binder/MemoryBase.cpp')
-rw-r--r-- | libs/binder/MemoryBase.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libs/binder/MemoryBase.cpp b/libs/binder/MemoryBase.cpp index 5c82330..033066b 100644 --- a/libs/binder/MemoryBase.cpp +++ b/libs/binder/MemoryBase.cpp @@ -14,7 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "MemoryBase" #include <stdlib.h> #include <stdint.h> @@ -45,11 +44,3 @@ 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!"); -} |