diff options
| author | Elliott Hughes <enh@google.com> | 2013-07-09 15:35:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-09 15:35:33 -0700 |
| commit | 54d97c88b57d2c341f0629c9648d4400a34e4f41 (patch) | |
| tree | 3610434840f2e9041aa92ce746e9b28cd917804b | |
| parent | 5477d0e4e858df1ea9cb1b6965a160fb5fe23b57 (diff) | |
| parent | 9da67a9427f695128b5da61c8f987fd9198a5e05 (diff) | |
| download | frameworks_native-54d97c88b57d2c341f0629c9648d4400a34e4f41.zip frameworks_native-54d97c88b57d2c341f0629c9648d4400a34e4f41.tar.gz frameworks_native-54d97c88b57d2c341f0629c9648d4400a34e4f41.tar.bz2 | |
am 9da67a94: am 67481607: Merge "Revert "Second try at adding a compatibility symbol for the MemoryBase constructor.""
* commit '9da67a9427f695128b5da61c8f987fd9198a5e05':
Revert "Second try at adding a compatibility symbol for the MemoryBase constructor."
| -rw-r--r-- | libs/binder/MemoryBase.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libs/binder/MemoryBase.cpp b/libs/binder/MemoryBase.cpp index 5c82330..033066b 100644 --- a/libs/binder/MemoryBase.cpp +++ b/libs/binder/MemoryBase.cpp @@ -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!"); -} |