diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-01-19 17:26:16 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-19 17:26:16 -0800 |
| commit | c3c36b4fe5863c8ac0ea5470be633e8fade9c483 (patch) | |
| tree | 1514a87b96fc32f01298f5438d32acc54f5d57c6 /core | |
| parent | 12b7da69957ef894ce5134989e38479c64308ea1 (diff) | |
| parent | 9d25b82d280c2d979d500e7da4447148f32f820b (diff) | |
| download | frameworks_base-c3c36b4fe5863c8ac0ea5470be633e8fade9c483.zip frameworks_base-c3c36b4fe5863c8ac0ea5470be633e8fade9c483.tar.gz frameworks_base-c3c36b4fe5863c8ac0ea5470be633e8fade9c483.tar.bz2 | |
am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"
* commit '9d25b82d280c2d979d500e7da4447148f32f820b':
Rename LOG_ASSERT to ALOG_ASSERT
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/com_android_internal_content_NativeLibraryHelper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp index 8db9621..b68c97a 100644 --- a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp +++ b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp @@ -309,7 +309,7 @@ iterateOverNativeFiles(JNIEnv *env, jstring javaFilePath, jstring javaCpuAbi, js } const char* lastSlash = strrchr(fileName, '/'); - LOG_ASSERT(lastSlash != NULL, "last slash was null somehow for %s\n", fileName); + ALOG_ASSERT(lastSlash != NULL, "last slash was null somehow for %s\n", fileName); // Check to make sure the CPU ABI of this file is one we support. const char* cpuAbiOffset = fileName + APK_LIB_LEN; |