Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
4737c511
Commit
4737c511
authored
Aug 19, 2022
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update to ONDK r25.2
parent
9806b38d
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
18 additions
and
7 deletions
+18
-7
gradle.properties
gradle.properties
+1
-1
Application.mk
native/src/Application.mk
+1
-1
Android.mk
native/src/external/Android.mk
+3
-1
busybox
native/src/external/busybox
+1
-1
libcxx
native/src/external/libcxx
+1
-1
Android.mk
native/src/external/systemproperties/Android.mk
+1
-0
api.hpp
native/src/zygisk/api.hpp
+6
-2
memory.hpp
native/src/zygisk/memory.hpp
+4
-0
No files found.
gradle.properties
View file @
4737c511
...
...
@@ -29,4 +29,4 @@ android.nonTransitiveRClass=true
# Magisk
magisk.stubVersion
=
33
magisk.versionCode
=
25201
magisk.ondkVersion
=
r25.
1
magisk.ondkVersion
=
r25.
2
native/src/Application.mk
View file @
4737c511
...
...
@@ -10,7 +10,7 @@ APP_STRIP_MODE := --strip-all
# Busybox should use stock libc.a
ifdef B_BB
APP_PLATFORM := android-2
4
APP_PLATFORM := android-2
6
APP_LDFLAGS += -T src/lto_fix.lds
ifeq ($(OS),Windows_NT)
APP_SHORT_COMMANDS := true
...
...
native/src/external/Android.mk
View file @
4737c511
...
...
@@ -383,7 +383,9 @@ include $(CLEAR_VARS)
LOCAL_MODULE:= libz
LOCAL_C_INCLUDES := $(LOCAL_PATH)/zlib
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 := \
zlib/adler32.c \
zlib/compress.c \
...
...
busybox
@
7236867e
Subproject commit
c2479d10d92d5a30ffa79ee73476b0c4707bf762
Subproject commit
7236867ef10bb9aeb68a7796a51f3fa269a23e4a
libcxx
@
82090ae7
Subproject commit
9b40e8b93627e0aef4ee8ad1b9f3aea913ee32c0
Subproject commit
82090ae75f7d284f2647a67f3f80f28f54eaddfc
native/src/external/systemproperties/Android.mk
View file @
4737c511
...
...
@@ -5,6 +5,7 @@ LOCAL_MODULE:= libsystemproperties
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
LOCAL_STATIC_LIBRARIES := libcxx
LOCAL_CFLAGS := -Wno-deprecated-declarations
LOCAL_SRC_FILES := \
context_node.cpp \
contexts_serialized.cpp \
...
...
native/src/zygisk/api.hpp
View file @
4737c511
...
...
@@ -325,8 +325,12 @@ inline bool Api::pltHookCommit() {
}
// namespace zygisk
extern
"C"
{
[[
gnu
::
visibility
(
"default"
)]]
[[
gnu
::
used
]]
extern
"C"
void
zygisk_module_entry
(
zygisk
::
internal
::
api_table
*
,
JNIEnv
*
);
void
zygisk_module_entry
(
zygisk
::
internal
::
api_table
*
,
JNIEnv
*
);
[[
gnu
::
visibility
(
"default"
)]]
[[
gnu
::
used
]]
extern
"C"
void
zygisk_companion_entry
(
int
);
void
zygisk_companion_entry
(
int
);
}
// extern "C"
native/src/zygisk/memory.hpp
View file @
4737c511
#pragma once
#include <map>
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-builtins"
#include <parallel_hashmap/phmap.h>
#pragma clang diagnostic pop
#include <base.hpp>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment