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

This commit is contained in:
Elliott Hughes 2013-07-09 22:27:16 +00:00 committed by Gerrit Code Review
commit 6748160785

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!");
}