diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-01-19 17:28:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-19 17:28:34 -0800 |
| commit | ee567e08d973c0fad214889e8d980f9bfb535b34 (patch) | |
| tree | bfdb82ec6aa8f362f74e8e2715814afdb2f15468 /core | |
| parent | 45470559cd4a499fd5d38cf708f0b531dc081fed (diff) | |
| parent | c3c36b4fe5863c8ac0ea5470be633e8fade9c483 (diff) | |
| download | frameworks_base-ee567e08d973c0fad214889e8d980f9bfb535b34.zip frameworks_base-ee567e08d973c0fad214889e8d980f9bfb535b34.tar.gz frameworks_base-ee567e08d973c0fad214889e8d980f9bfb535b34.tar.bz2 | |
am c3c36b4f: am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"
* commit 'c3c36b4fe5863c8ac0ea5470be633e8fade9c483':
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; |