From 2dccfdcd265ca86cca5ac863d921e5c647b93073 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 9 Jul 2013 22:15:42 +0000 Subject: [PATCH] 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 --- libs/binder/MemoryBase.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/libs/binder/MemoryBase.cpp b/libs/binder/MemoryBase.cpp index 5c823302f..033066bea 100644 --- a/libs/binder/MemoryBase.cpp +++ b/libs/binder/MemoryBase.cpp @@ -14,7 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "MemoryBase" #include #include @@ -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!"); -}