commit e77db6cc6d14a51f3fce4eea01c7e375872e0b76
author Slava Shklyaev <slavash@google.com> Thu Feb 04 17:12:42 2021 +0000
committer Slava Shklyaev <slavash@google.com> Mon Feb 15 12:44:41 2021 +0000
tree 9b8a474e8f072280bc8d912d32a5c2c57dbd7f17
parent 1ee86af092ce3f45a321d495f9dd0b33f9c79ded

Fix compilation error when LOG_TAG is NULL

I get the following error when using android_testLog():

    packages/modules/NeuralNetworks/TypeUtils.h:206:28: error: indirection requires pointer operand ('long' invalid)
            android_testLog(_priority, LOG_TAG))                         \
            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    system/logging/liblog/include/log/log_main.h:368:55: note: expanded from macro 'android_testLog'
      (__android_log_is_loggable_len(prio, tag, ((tag) && *(tag)) ? strlen(tag) : 0, \
                                                          ^~~~~~

Bug: N/A
Test: m
Change-Id: Ida6edbaf322473389e11ab81bf630d99c10e5e01

liblog/include/log/log_main.h

diff --git a/liblog/include/log/log_main.h b/liblog/include/log/log_main.h
index 1bd1c8a..799a8e2 100644
--- a/liblog/include/log/log_main.h
+++ b/liblog/include/log/log_main.h
@@ -364,13 +364,11 @@
 int __android_log_is_loggable_len(int prio, const char* tag, size_t len, int default_prio);
 
 #if LOG_NDEBUG /* Production */
-#define android_testLog(prio, tag)                                           \
-  (__android_log_is_loggable_len(prio, tag, ((tag) && *(tag)) ? strlen(tag) : 0, \
-                                 ANDROID_LOG_DEBUG) != 0)
+#define android_testLog(prio, tag) \
+  (__android_log_is_loggable_len(prio, tag, (tag) ? strlen(tag) : 0, ANDROID_LOG_DEBUG) != 0)
 #else
-#define android_testLog(prio, tag)                                           \
-  (__android_log_is_loggable_len(prio, tag, ((tag) && *(tag)) ? strlen(tag) : 0, \
-                                 ANDROID_LOG_VERBOSE) != 0)
+#define android_testLog(prio, tag) \
+  (__android_log_is_loggable_len(prio, tag, (tag) ? strlen(tag) : 0, ANDROID_LOG_VERBOSE) != 0)
 #endif
 
 #if defined(__clang__)