TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-25 13:57:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Proper namespacing

Browse Source 
The IDE will get confused when #include is in a namespace
This commit is contained in:
topjohnwu 2022-06-15 02:38:56 -07:00
parent db78c20161
commit 9469e79e3c
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
native/jni/zygisk/gen_jni_hooks.py
View File

@ -271,6 +271,7 @@ def gen_jni_hook():
with open('jni_hooks.hpp', 'w') as f: with open('jni_hooks.hpp', 'w') as f:
f.write('// Generated by gen_jni_hooks.py\n') f.write('// Generated by gen_jni_hooks.py\n')
f.write('\nnamespace {\n')
zygote = 'com/android/internal/os/Zygote' zygote = 'com/android/internal/os/Zygote'
@ -285,4 +286,4 @@ with open('jni_hooks.hpp', 'w') as f:
f.write(gen_jni_hook()) f.write(gen_jni_hook())
f.write('\n') f.write('\n\n} // namespace\n')

4
native/jni/zygisk/hook.cpp
View File

@ -79,6 +79,8 @@ HookContext *g_ctx;
const JNINativeInterface *old_functions; const JNINativeInterface *old_functions;
JNINativeInterface *new_functions; JNINativeInterface *new_functions;
} // namespace
#define HOOK_JNI(method) \ #define HOOK_JNI(method) \
if (methods[i].name == #method##sv) { \ if (methods[i].name == #method##sv) { \
int j = 0; \ int j = 0; \
@ -103,6 +105,8 @@ if (methods[i].name == #method##sv) {
#undef HOOK_JNI #undef HOOK_JNI
namespace {
jclass gClassRef; jclass gClassRef;
jmethodID class_getName; jmethodID class_getName;
string get_class_name(JNIEnv *env, jclass clazz) { string get_class_name(JNIEnv *env, jclass clazz) {

4
native/jni/zygisk/jni_hooks.hpp
View File

@ -1,5 +1,7 @@
// Generated by gen_jni_hooks.py // Generated by gen_jni_hooks.py
namespace {
void *nativeForkAndSpecialize_orig = nullptr; void *nativeForkAndSpecialize_orig = nullptr;
jint nativeForkAndSpecialize_l(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jintArray fds_to_close, jstring instruction_set, jstring app_data_dir) { jint nativeForkAndSpecialize_l(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jintArray fds_to_close, jstring instruction_set, jstring app_data_dir) {
AppSpecializeArgs_v3 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir); AppSpecializeArgs_v3 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
@ -318,3 +320,5 @@ unique_ptr<JNINativeMethod[]> hookAndSaveJNIMethods(const char *className, const
} }
return newMethods; return newMethods;
} }
} // namespace