From 510c407e36a2312a547e99f33e99099a0e67a68c Mon Sep 17 00:00:00 2001 From: JingMatrix Date: Tue, 31 Mar 2026 20:05:51 +0200 Subject: [PATCH 1/2] Unify logging styles of LOGD and LOGV We now only include source file name and line number for LOGD. --- daemon/src/main/jni/logging.h | 8 ++++++-- dex2oat/src/main/cpp/include/logging.h | 6 +++--- native/include/common/logging.h | 7 +++---- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/daemon/src/main/jni/logging.h b/daemon/src/main/jni/logging.h index 86a7220ac..5ebf4ec24 100644 --- a/daemon/src/main/jni/logging.h +++ b/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 diff --git a/dex2oat/src/main/cpp/include/logging.h b/dex2oat/src/main/cpp/include/logging.h index ab66ef34c..36069bdd4 100644 --- a/dex2oat/src/main/cpp/include/logging.h +++ b/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 diff --git a/native/include/common/logging.h b/native/include/common/logging.h index 25533e4fb..a06585bc5 100644 --- a/native/include/common/logging.h +++ b/native/include/common/logging.h @@ -77,14 +77,13 @@ inline void LogToAndroid(int prio, const char *tag, fmt::format_string 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) From 9fe9ffad7e17fb140670aa45b029a16b49b3d44b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2026 01:44:22 +0000 Subject: [PATCH 2/2] Bump the actions group across 1 directory with 3 updates Bumps the actions group with 3 updates in the / directory: [gradle/actions](https://github.com/gradle/actions), [android-actions/setup-android](https://github.com/android-actions/setup-android) and [actions/upload-artifact](https://github.com/actions/upload-artifact). Updates `gradle/actions` from 5 to 6 - [Release notes](https://github.com/gradle/actions/releases) - [Commits](https://github.com/gradle/actions/compare/v5...v6) Updates `android-actions/setup-android` from 3 to 4 - [Release notes](https://github.com/android-actions/setup-android/releases) - [Commits](https://github.com/android-actions/setup-android/compare/v3...v4) Updates `actions/upload-artifact` from 6 to 7 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v6...v7) --- updated-dependencies: - dependency-name: gradle/actions dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major dependency-group: actions - dependency-name: android-actions/setup-android dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major dependency-group: actions - dependency-name: actions/upload-artifact dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major dependency-group: actions ... Signed-off-by: dependabot[bot] --- .github/workflows/core.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index c0a3d55ce..1bcc7d25c 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -42,7 +42,7 @@ jobs: java-version: 21 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v5 + uses: gradle/actions/setup-gradle@v6 - name: Configure Gradle properties run: | @@ -67,7 +67,7 @@ jobs: ${{ runner.os }}-ccache- - name: Setup Android SDK - uses: android-actions/setup-android@v3 + uses: android-actions/setup-android@v4 - name: Remove Android's cmake shell: bash @@ -87,19 +87,19 @@ jobs: unzip zygisk/release/Vector-v*-Debug.zip -d Vector-Debug - name: Upload zygisk release - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: ${{ steps.prepareArtifact.outputs.zygiskReleaseName }} path: "./Vector-Release/*" - name: Upload zygisk debug - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: ${{ steps.prepareArtifact.outputs.zygiskDebugName }} path: "./Vector-Debug/*" - name: Upload mappings - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: mappings path: | @@ -107,7 +107,7 @@ jobs: app/build/outputs/mapping - name: Upload symbols - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: symbols path: build/symbols