Skip to content

Fix Windows build error #663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ispointer wants to merge 5 commits into from
+375 −363
Closed

Fix Windows build error #663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
98b5773
Refactor version code and name declarations
ispointer Apr 13, 2026
469ea69
Fix escape characters in build.gradle.kts
ispointer Apr 13, 2026
aac7827
Update build.gradle.kts
ispointer Apr 13, 2026
4c9d909
Refactor string constants to use std::string_view
ispointer Apr 13, 2026
4b331f7
Update module.cpp
ispointer Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ subprojects {
val flags =
listOf(
"-DVERSION_CODE=${versionCodeProvider.get()}",
"-DVERSION_NAME='\"${versionNameProvider.get()}\"'",
"-DVERSION_NAME=\\\"${versionNameProvider.get()}\\\"",
)

val args =
Expand Down
7 changes: 5 additions & 2 deletions native/include/common/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ inline constexpr bool kIsDebugBuild = IsDebugBuild();
#define LP_SELECT(lp32, lp64) lp32
#endif

#define V_STR(x) #x
#define V_TOSTR(x) V_STR(x)

/// The filename of the core Android Runtime (ART) library.
inline constexpr auto kArtLibraryName = "libart.so";

Expand All @@ -43,9 +46,9 @@ inline constexpr auto kFrameworkLibraryName = "libandroidfw.so";
inline constexpr auto kLinkerPath = "/linker";

/// The version code of the library, populated by the build system.
const int kVersionCode = VERSION_CODE;
inline constexpr int kVersionCode = VERSION_CODE;

/// The version name of the library, populated by the build system.
const char *const kVersionName = VERSION_NAME;
inline constexpr auto kVersionName = V_TOSTR(VERSION_NAME);

} // namespace vector::native
4 changes: 2 additions & 2 deletions zygisk/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ android {

val flags =
listOf(
"-DINJECTED_PACKAGE_NAME='\"${injectedPackageName}\"'",
"-DINJECTED_PACKAGE_NAME=\\\"${injectedPackageName}\\\"",
"-DINJECTED_PACKAGE_UID=${injectedPackageUid}",
"-DMANAGER_PACKAGE_NAME='\"${defaultManagerPackageName}\"'",
"-DMANAGER_PACKAGE_NAME=\\\"${defaultManagerPackageName}\\\"",
)

externalNativeBuild {
Expand Down
Loading