summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-01-19 14:47:34 -0800
committerandroid code review <noreply-gerritcodereview@google.com>2012-01-19 14:47:35 -0800
commit9d25b82d280c2d979d500e7da4447148f32f820b (patch)
treea3ce92223f977611f6a1ab6710901a68fad8a968 /core
parent6df477be186233e36fc370c4d2db6c1ed928a740 (diff)
parentf68633da3ced654a9344b5c3b82f4d1c79b6bd09 (diff)
downloadframeworks_base-9d25b82d280c2d979d500e7da4447148f32f820b.zip
frameworks_base-9d25b82d280c2d979d500e7da4447148f32f820b.tar.gz
frameworks_base-9d25b82d280c2d979d500e7da4447148f32f820b.tar.bz2
Merge "Rename LOG_ASSERT to ALOG_ASSERT"
Diffstat (limited to 'core')
-rw-r--r--core/jni/com_android_internal_content_NativeLibraryHelper.cpp2
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 79be2b2..a5b85b4 100644
--- a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp
+++ b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp
@@ -308,7 +308,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;