TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-02-17 15:38:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to ONDK r25.2

Browse Source
This commit is contained in:
topjohnwu 2022-08-19 16:26:25 -07:00
parent 9806b38d8e
commit 4737c5117a
8 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -29,4 +29,4 @@ android.nonTransitiveRClass=true
# Magisk # Magisk
magisk.stubVersion=33 magisk.stubVersion=33
magisk.versionCode=25201 magisk.versionCode=25201
magisk.ondkVersion=r25.1 magisk.ondkVersion=r25.2

2
native/src/Application.mk
View File

@ -10,7 +10,7 @@ APP_STRIP_MODE := --strip-all
# Busybox should use stock libc.a # Busybox should use stock libc.a
ifdef B_BB ifdef B_BB
APP_PLATFORM := android-24 APP_PLATFORM := android-26
APP_LDFLAGS += -T src/lto_fix.lds APP_LDFLAGS += -T src/lto_fix.lds
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
APP_SHORT_COMMANDS := true APP_SHORT_COMMANDS := true

4
native/src/external/Android.mk vendored
View File

@ -383,7 +383,9 @@ include $(CLEAR_VARS)
LOCAL_MODULE:= libz LOCAL_MODULE:= libz
LOCAL_C_INCLUDES := $(LOCAL_PATH)/zlib LOCAL_C_INCLUDES := $(LOCAL_PATH)/zlib
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
LOCAL_CFLAGS := -DHAVE_HIDDEN -DZLIB_CONST -Wall -Werror -Wno-unused -Wno-unused-parameter LOCAL_CFLAGS := \
-DHAVE_HIDDEN -DZLIB_CONST -Wall -Werror \
-Wno-unused -Wno-unused-parameter -Wno-deprecated-non-prototype
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
zlib/adler32.c \ zlib/adler32.c \
zlib/compress.c \ zlib/compress.c \

2
native/src/external/busybox vendored

@ -1 +1 @@
Subproject commit c2479d10d92d5a30ffa79ee73476b0c4707bf762 Subproject commit 7236867ef10bb9aeb68a7796a51f3fa269a23e4a

2
native/src/external/libcxx vendored

@ -1 +1 @@
Subproject commit 9b40e8b93627e0aef4ee8ad1b9f3aea913ee32c0 Subproject commit 82090ae75f7d284f2647a67f3f80f28f54eaddfc

1
native/src/external/systemproperties/Android.mk vendored
View File

@ -5,6 +5,7 @@ LOCAL_MODULE:= libsystemproperties
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
LOCAL_STATIC_LIBRARIES := libcxx LOCAL_STATIC_LIBRARIES := libcxx
LOCAL_CFLAGS := -Wno-deprecated-declarations
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
context_node.cpp \ context_node.cpp \
contexts_serialized.cpp \ contexts_serialized.cpp \

10
native/src/zygisk/api.hpp
View File

@ -325,8 +325,12 @@ inline bool Api::pltHookCommit() {
} // namespace zygisk } // namespace zygisk
[[gnu::visibility("default")]] [[gnu::used]] extern "C" {
extern "C" void zygisk_module_entry(zygisk::internal::api_table *, JNIEnv *);
[[gnu::visibility("default")]] [[gnu::used]] [[gnu::visibility("default")]] [[gnu::used]]
extern "C" void zygisk_companion_entry(int); void zygisk_module_entry(zygisk::internal::api_table *, JNIEnv *);
[[gnu::visibility("default")]] [[gnu::used]]
void zygisk_companion_entry(int);
} // extern "C"

4
native/src/zygisk/memory.hpp
View File

@ -1,7 +1,11 @@
#pragma once #pragma once
#include <map> #include <map>
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-builtins"
#include <parallel_hashmap/phmap.h> #include <parallel_hashmap/phmap.h>
#pragma clang diagnostic pop
#include <base.hpp> #include <base.hpp>