commit 6d3fbd7737583f1344e58f3e742898207e283b55
author Steve Block <steveblock@google.com> Wed Oct 26 04:48:37 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 26 04:48:37 2011 -0700
tree aa6f062812e30d66427e0363d463baa1c5149f5e
parent 72e281f9b04d434c3326a869ded9fdd36fde6705
parent 292b1c28091b32a418eb44dcdef157a7b808abd4

am 92c1f6f1: (-s ours) Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)  DO NOT MERGE

* commit '92c1f6f1b4249e4e379452ee7b49f027052bf4ce':
  Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)  DO NOT MERGE

JNIHelp.cpp

diff --git a/JNIHelp.cpp b/JNIHelp.cpp
index a9a1167..e1ad6fc 100644
--- a/JNIHelp.cpp
+++ b/JNIHelp.cpp
@@ -68,7 +68,7 @@
 {
     JNIEnv* e = reinterpret_cast<JNIEnv*>(env);
 
-    ALOGV("Registering %s natives", className);
+    LOGV("Registering %s natives", className);
 
     scoped_local_ref<jclass> c(env, findClass(env, className));
     if (c.get() == NULL) {

include/nativehelper/JNIHelp.h

diff --git a/include/nativehelper/JNIHelp.h b/include/nativehelper/JNIHelp.h
index f5666f2..aa98c2c 100644
--- a/include/nativehelper/JNIHelp.h
+++ b/include/nativehelper/JNIHelp.h
@@ -167,7 +167,7 @@
  * from the JNI environment, if any.
  */
 #define LOG_EX(env, priority, tag, ...) \
-    IF_ALOG(priority, tag) jniLogException(env, ANDROID_##priority, tag, ##__VA_ARGS__)
+    IF_LOG(priority, tag) jniLogException(env, ANDROID_##priority, tag, ##__VA_ARGS__)
 #define LOGV_EX(env, ...) LOG_EX(env, LOG_VERBOSE, LOG_TAG, ##__VA_ARGS__)
 #define LOGD_EX(env, ...) LOG_EX(env, LOG_DEBUG, LOG_TAG, ##__VA_ARGS__)
 #define LOGI_EX(env, ...) LOG_EX(env, LOG_INFO, LOG_TAG, ##__VA_ARGS__)