Version 18.1

Updates to OEMCrypto API, OPK, ODK, and unit tests.

See the file CHANGELOG.md for details.

util/include/log.h

@@ -77,31 +77,34 @@ struct LoggingUidSetter {
 // This function is supplied for cases where the system layer does not
 // initialize logging.  This is also needed to initialize logging in
 // unit tests.
-CORE_UTIL_EXPORT void InitLogging();
+void InitLogging();
 
 #ifdef __GNUC__
-[[gnu::format(printf, 5, 6)]] CORE_UTIL_EXPORT void Log(const char* file,
-                                                        const char* function,
-                                                        int line,
-                                                        LogPriority level,
-                                                        const char* fmt, ...);
-#else
-CORE_UTIL_EXPORT void Log(const char* file, const char* function, int line,
-                          LogPriority level, const char* fmt, ...);
+[[gnu::format(printf, 5, 6)]]
 #endif
+void Log(const char* file, const char* function, int line,
+         LogPriority level, const char* fmt, ...);
 
 // Log APIs
-#ifndef LOGE
-#  define LOGE(...) \
+#ifdef CDM_DISABLE_LOGGING
+#  define LOGE(...) (void)0
+#  define LOGW(...) (void)0
+#  define LOGI(...) (void)0
+#  define LOGD(...) (void)0
+#  define LOGV(...) (void)0
+#else
+#  ifndef LOGE
+#    define LOGE(...) \
     Log(__FILE__, __func__, __LINE__, wvutil::CDM_LOG_ERROR, __VA_ARGS__)
-#  define LOGW(...) \
+#    define LOGW(...) \
     Log(__FILE__, __func__, __LINE__, wvutil::CDM_LOG_WARN, __VA_ARGS__)
-#  define LOGI(...) \
+#    define LOGI(...) \
     Log(__FILE__, __func__, __LINE__, wvutil::CDM_LOG_INFO, __VA_ARGS__)
-#  define LOGD(...) \
+#    define LOGD(...) \
     Log(__FILE__, __func__, __LINE__, wvutil::CDM_LOG_DEBUG, __VA_ARGS__)
-#  define LOGV(...) \
+#    define LOGV(...) \
     Log(__FILE__, __func__, __LINE__, wvutil::CDM_LOG_VERBOSE, __VA_ARGS__)
+#  endif
 #endif
 }  // namespace wvutil