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.
This commit is contained in:
commit
5b00af2435
@ -14,6 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#define LOG_TAG "MemoryBase"
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
@ -44,3 +45,11 @@ 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!");
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user