diff --git a/contrib/tinyusdz/tinyusdz_repo/src/common-macros.inc b/contrib/tinyusdz/tinyusdz_repo/src/common-macros.inc index af86fc114..c11e44d2b 100644 --- a/contrib/tinyusdz/tinyusdz_repo/src/common-macros.inc +++ b/contrib/tinyusdz/tinyusdz_repo/src/common-macros.inc @@ -1,5 +1,10 @@ #pragma once +#if defined(__ANDROID__) +#include +#include +#endif // #if defined(__ANDROID__) + #if !defined(TINYUSDZ_PRODUCTION_BUILD) && !defined(TINYUSDZ_FUZZER_BUILD) #if defined(TINYUSDZ_DEBUG_PRINT) #define TINYUSDZ_LOCAL_DEBUG_PRINT @@ -89,14 +94,38 @@ #endif // TINYUSDZ_PRODUCTION_BUILD #if defined(TINYUSDZ_LOCAL_DEBUG_PRINT) +#if defined(__ANDROID__) +#define TINYUSDZLOGT(tag, ...) ((void)__android_log_print(ANDROID_LOG_DEBUG, tag, __VA_ARGS__)) +#define TINYUSDZLOG0(tag, ...) ((void)__android_log_print(ANDROID_LOG_DEFAULT, tag, __VA_ARGS__)) +#define TINYUSDZLOGD(tag, ...) ((void)__android_log_print(ANDROID_LOG_DEBUG, tag, __VA_ARGS__)) +#define TINYUSDZLOGI(tag, ...) ((void)__android_log_print(ANDROID_LOG_INFO, tag, __VA_ARGS__)) +#define TINYUSDZLOGW(tag, ...) ((void)__android_log_print(ANDROID_LOG_WARN, tag, __VA_ARGS__)) +#define TINYUSDZLOGE(tag, ...) ((void)__android_log_print(ANDROID_LOG_ERROR, tag, __VA_ARGS__)) +#define DCOUT(x) \ + do { \ + std::stringstream ss; \ + ss << __FILE__ << ":" << __func__ << ":" \ + << std::to_string(__LINE__) << " " << x << "\n"; \ + TINYUSDZLOGE("tinyusdz", "%s", ss.str().c_str()); \ + } while (false) +#else #define DCOUT(x) \ do { \ std::cout << __FILE__ << ":" << __func__ << ":" \ << std::to_string(__LINE__) << " " << x << "\n"; \ } while (false) +#endif // #if defined(__ANDROID__) #else +#if defined(__ANDROID__) +#define TINYUSDZLOGT(tag, ...) +#define TINYUSDZLOG0(tag, ...) +#define TINYUSDZLOGD(tag, ...) +#define TINYUSDZLOGI(tag, ...) +#define TINYUSDZLOGW(tag, ...) +#define TINYUSDZLOGE(tag, ...) +#endif // #if defined(__ANDROID__) #define DCOUT(x) -#endif +#endif // #if defined(TINYUSDZ_LOCAL_DEBUG_PRINT) // Simple auto-free class // Use this class when saving stack size is required(e.g. recursive function call).