Unify logging styles of LOGD and LOGV

We now only include source file name and line number for LOGD.

Author: JingMatrix

daemon/src/main/jni/logging.h

@@ -36,8 +36,12 @@
 #define LOGE(...) 0
 #else
 #ifndef NDEBUG
-#define LOGD(fmt, ...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, "%s:%d#%s" ": " fmt, __FILE_NAME__, __LINE__, __PRETTY_FUNCTION__ __VA_OPT__(,) __VA_ARGS__)
-#define LOGV(fmt, ...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, "%s:%d#%s" ": " fmt, __FILE_NAME__, __LINE__, __PRETTY_FUNCTION__ __VA_OPT__(,) __VA_ARGS__)
+#define LOGD(fmt, ...)                                                                             \
+    __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG,                                                \
+                        "%s:%d#%s"                                                                 \
+                        ": " fmt,                                                                  \
+                        __FILE_NAME__, __LINE__, __PRETTY_FUNCTION__ __VA_OPT__(, ) __VA_ARGS__)
+#define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__)
 #else
 #define LOGD(...) 0
 #define LOGV(...) 0

dex2oat/src/main/cpp/include/logging.h

@@ -15,12 +15,12 @@
 #define LOGE(...) 0
 #else
 #ifndef NDEBUG
-#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
-#define LOGV(fmt, ...)                                                                             \
-    __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG,                                              \
+#define LOGD(fmt, ...)                                                                             \
+    __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG,                                                \
                         "%s:%d#%s"                                                                 \
                         ": " fmt,                                                                  \
                         __FILE_NAME__, __LINE__, __PRETTY_FUNCTION__ __VA_OPT__(, ) __VA_ARGS__)
+#define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__)
 #else
 #define LOGD(...) 0
 #define LOGV(...) 0

native/include/common/logging.h

@@ -77,14 +77,13 @@ inline void LogToAndroid(int prio, const char *tag, fmt::format_string<T...> fmt
 }  // namespace vector::native::detail
 
 #ifndef NDEBUG
-#define LOGV(fmt, ...)                                                                             \
-    ::vector::native::detail::LogToAndroid(ANDROID_LOG_VERBOSE, LOG_TAG, "{}:{} ({}): " fmt,       \
-                                           __FILE_NAME__, __LINE__,                                \
-                                           __PRETTY_FUNCTION__ __VA_OPT__(, ) __VA_ARGS__)
 #define LOGD(fmt, ...)                                                                             \
     ::vector::native::detail::LogToAndroid(ANDROID_LOG_DEBUG, LOG_TAG, "{}:{} ({}): " fmt,         \
                                            __FILE_NAME__, __LINE__,                                \
                                            __PRETTY_FUNCTION__ __VA_OPT__(, ) __VA_ARGS__)
+#define LOGV(fmt, ...)                                                                             \
+    ::vector::native::detail::LogToAndroid(ANDROID_LOG_VERBOSE, LOG_TAG,                           \
+                                           fmt __VA_OPT__(, ) __VA_ARGS__)
 #else
 #define LOGV(...) ((void)0)
 #define LOGD(...) ((void)0)