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

Commit 9da67a94 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

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

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

* commit '67481607':
  Revert "Second try at adding a compatibility symbol for the MemoryBase constructor."
parents f4f2bd21 67481607

libs/binder/MemoryBase.cpp

+0 −9
Original line number Original line Diff line number Diff line
@@ -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!");

}