From 4ecb4a9276c29633e8c4e6332e1c04a53af5c494 Mon Sep 17 00:00:00 2001
From: Nullptr <noreply@nullptr.icu>
Date: Thu, 2 Feb 2023 22:47:18 +0800
Subject: [PATCH] Fix release build

---
 loader/src/Application.mk      | 2 +-
 loader/src/injector/entry.cpp  | 4 ++--
 loader/src/injector/memory.hpp | 1 -
 module/build.gradle.kts        | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/loader/src/Application.mk b/loader/src/Application.mk
index b15ac157..9ac9783e 100644
--- a/loader/src/Application.mk
+++ b/loader/src/Application.mk
@@ -7,7 +7,7 @@ APP_STL        := none
 
 ifneq ($(NDK_DEBUG),1)
 APP_CFLAGS     += -Oz -flto
-APP_CFLAGS     += -Wno-unused -Wno-unused-parameter -Werror
+APP_CFLAGS     += -Wno-unused -Wno-unused-parameter
 APP_CFLAGS     += -fvisibility=hidden -fvisibility-inlines-hidden
 APP_CFLAGS     += -fno-unwind-tables -fno-asynchronous-unwind-tables
 APP_LDFLAGS    += -Wl,--exclude-libs,ALL -flto -Wl,--gc-sections -Wl,--strip-all
diff --git a/loader/src/injector/entry.cpp b/loader/src/injector/entry.cpp
index 47fbe439..6c83c5f3 100644
--- a/loader/src/injector/entry.cpp
+++ b/loader/src/injector/entry.cpp
@@ -15,7 +15,8 @@ static void zygisk_cleanup_wait() {
     }
 }
 
-extern "C" __used void entry(void *handle) {
+extern "C" [[gnu::visibility("default")]]
+void entry(void *handle) {
     LOGD("Load injector successfully");
     self_handle = handle;
     hook_functions();
@@ -27,4 +28,3 @@ static inline bool should_load_modules(uint32_t flags) {
     return (flags & UNMOUNT_MASK) != UNMOUNT_MASK &&
            (flags & PROCESS_IS_MAGISK_APP) != PROCESS_IS_MAGISK_APP;
 }
-
diff --git a/loader/src/injector/memory.hpp b/loader/src/injector/memory.hpp
index cc619e94..a48c44a0 100644
--- a/loader/src/injector/memory.hpp
+++ b/loader/src/injector/memory.hpp
@@ -4,7 +4,6 @@
 #include <sys/mman.h>
 
 #pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-builtins"
 #include <parallel_hashmap/phmap.h>
 #pragma clang diagnostic pop
 
diff --git a/module/build.gradle.kts b/module/build.gradle.kts
index 9a7c4d65..4f3d50f7 100644
--- a/module/build.gradle.kts
+++ b/module/build.gradle.kts
@@ -23,7 +23,7 @@ androidComponents.onVariants { variant ->
     val buildTypeLowered = variant.buildType?.toLowerCase()
 
     val moduleDir = "$buildDir/outputs/module/$variantLowered"
-    val zipFileName = "$moduleName-$verName-$buildTypeLowered.zip".replace(' ', '-')
+    val zipFileName = "$moduleName-$verName-$verCode-$buildTypeLowered.zip".replace(' ', '-')
 
     val prepareModuleFilesTask = task<Sync>("prepareModuleFiles$variantCapped") {
         group = "module"