diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2013-01-08 22:49:09 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-01-08 22:49:09 -0800 |
| commit | 23c9e9df7b8f02877f07c02564d9048f0257fd6e (patch) | |
| tree | 9630b6df45284e6bdc0cac94e5ae37284235756f /native/jni/jni_common.cpp | |
| parent | 6b25917079ab86082a909793669dca112fd8d2c3 (diff) | |
| parent | 8f5f79d7ea824752dcaa4e035e71291e7dd7ddaf (diff) | |
| download | latinime-23c9e9df7b8f02877f07c02564d9048f0257fd6e.tar.gz latinime-23c9e9df7b8f02877f07c02564d9048f0257fd6e.tar.xz latinime-23c9e9df7b8f02877f07c02564d9048f0257fd6e.zip | |
am 8f5f79d7: Merge "Replace assert() with ASSERT() & use -funwind-tables for debug builds"
* commit '8f5f79d7ea824752dcaa4e035e71291e7dd7ddaf':
Replace assert() with ASSERT() & use -funwind-tables for debug builds
Diffstat (limited to 'native/jni/jni_common.cpp')
| -rw-r--r-- | native/jni/jni_common.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/native/jni/jni_common.cpp b/native/jni/jni_common.cpp index 7b97cf4db..1ea204102 100644 --- a/native/jni/jni_common.cpp +++ b/native/jni/jni_common.cpp @@ -16,8 +16,6 @@ #define LOG_TAG "LatinIME: jni" -#include <cassert> - #include "com_android_inputmethod_keyboard_ProximityInfo.h" #include "com_android_inputmethod_latin_BinaryDictionary.h" #include "com_android_inputmethod_latin_DicTraverseSession.h" @@ -35,7 +33,7 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) { AKLOGE("ERROR: GetEnv failed"); return -1; } - assert(env); + ASSERT(env); if (!env) { AKLOGE("ERROR: JNIEnv is invalid"); return -1; |