From dbc350a75e2f59f58732ad4c2d91cb6657c9ebf3 Mon Sep 17 00:00:00 2001 From: LoveSy Date: Thu, 28 Apr 2022 11:38:10 +0800 Subject: [PATCH] Fix hooking internal used methods (#1900) --- core/src/main/jni/include/logging.h | 14 +++++++------- daemon/src/main/jni/logging.h | 14 +++++++------- dex2oat/src/main/cpp/logging.h | 14 +++++++------- external/lsplant | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/core/src/main/jni/include/logging.h b/core/src/main/jni/include/logging.h index 7d55e4b4..76b96b09 100644 --- a/core/src/main/jni/include/logging.h +++ b/core/src/main/jni/include/logging.h @@ -30,11 +30,11 @@ #endif #ifdef LOG_DISABLED -#define LOGD(...) -#define LOGV(...) -#define LOGI(...) -#define LOGW(...) -#define LOGE(...) +#define LOGD(...) 0 +#define LOGV(...) 0 +#define LOGI(...) 0 +#define LOGW(...) 0 +#define LOGE(...) 0 #else template constexpr inline void LOG(int prio, const char* tag, fmt::format_string fmt, T&&... args) { @@ -47,8 +47,8 @@ constexpr inline void LOG(int prio, const char* tag, fmt::format_string fm #define LOGD(fmt, ...) LOG(ANDROID_LOG_DEBUG, LOG_TAG, "{}:{}#{}" ": " fmt, __FILE_NAME__, __LINE__, __PRETTY_FUNCTION__ __VA_OPT__(,) __VA_ARGS__) #define LOGV(fmt, ...) LOG(ANDROID_LOG_VERBOSE, LOG_TAG, "{}:{}#{}" ": " fmt, __FILE_NAME__, __LINE__, __PRETTY_FUNCTION__ __VA_OPT__(,) __VA_ARGS__) #else -#define LOGD(...) -#define LOGV(...) +#define LOGD(...) 0 +#define LOGV(...) 0 #endif #define LOGI(...) LOG(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__) #define LOGW(...) LOG(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__) diff --git a/daemon/src/main/jni/logging.h b/daemon/src/main/jni/logging.h index 6d4be69e..34d7f606 100644 --- a/daemon/src/main/jni/logging.h +++ b/daemon/src/main/jni/logging.h @@ -28,18 +28,18 @@ #endif #ifdef LOG_DISABLED -#define LOGD(...) -#define LOGV(...) -#define LOGI(...) -#define LOGW(...) -#define LOGE(...) +#define LOGD(...) 0 +#define LOGV(...) 0 +#define LOGI(...) 0 +#define LOGW(...) 0 +#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__) #else -#define LOGD(...) -#define LOGV(...) +#define LOGD(...) 0 +#define LOGV(...) 0 #endif #define LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__) #define LOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__) diff --git a/dex2oat/src/main/cpp/logging.h b/dex2oat/src/main/cpp/logging.h index 30927519..829ebcfd 100644 --- a/dex2oat/src/main/cpp/logging.h +++ b/dex2oat/src/main/cpp/logging.h @@ -7,11 +7,11 @@ #endif #ifdef LOG_DISABLED -#define LOGD(...) -#define LOGV(...) -#define LOGI(...) -#define LOGW(...) -#define LOGE(...) +#define LOGD(...) 0 +#define LOGV(...) 0 +#define LOGI(...) 0 +#define LOGW(...) 0 +#define LOGE(...) 0 #else #ifndef NDEBUG #define LOGD(fmt, ...) \ @@ -25,8 +25,8 @@ ": " fmt, \ __FILE_NAME__, __LINE__, __PRETTY_FUNCTION__ __VA_OPT__(, ) __VA_ARGS__) #else -#define LOGD(...) -#define LOGV(...) +#define LOGD(...) 0 +#define LOGV(...) 0 #endif #define LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__) #define LOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__) diff --git a/external/lsplant b/external/lsplant index 050348fd..d3cd9313 160000 --- a/external/lsplant +++ b/external/lsplant @@ -1 +1 @@ -Subproject commit 050348fd08325321c7a67ce6355ddcd51bcace57 +Subproject commit d3cd9313644499c181212dd66602f6ab2aa75ab6