ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

am 67481607: Merge "Revert "Second try at adding a compatibility symbol for the MemoryBase constructor.""

Browse Source 
* commit '674816078588d0951c3c9bdaf26ecc9e9b3f2e0a':
  Revert "Second try at adding a compatibility symbol for the MemoryBase constructor."
This commit is contained in:
Elliott Hughes 2013-07-09 15:30:48 -07:00 committed by Android Git Automerger
commit 9da67a9427
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/binder/MemoryBase.cpp
View File

@ -14,7 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
#define LOG_TAG "MemoryBase"
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>
@ -45,11 +44,3 @@ MemoryBase::~MemoryBase()
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
}; // namespace android }; // 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!");
}