Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67481607 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

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

parents 0ecf0b8d 2dccfdcd
Loading
Loading
Loading
Loading
+0 −9
Original line number Diff line number Diff line
@@ -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!");
}