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
1e2f776b
Commit
1e2f776b
authored
Jun 17, 2020
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move logging.hpp
parent
ec3705f2
Show whitespace changes
Inline
Side-by-side
Showing
27 changed files
with
5 additions
and
25 deletions
+5
-25
socket.cpp
native/jni/core/socket.cpp
+0
-1
magisk.hpp
native/jni/include/magisk.hpp
+0
-1
getinfo.cpp
native/jni/init/getinfo.cpp
+0
-1
init.hpp
native/jni/init/init.hpp
+1
-1
mount.cpp
native/jni/init/mount.cpp
+0
-1
twostage.cpp
native/jni/init/twostage.cpp
+0
-1
bootimg.cpp
native/jni/magiskboot/bootimg.cpp
+0
-1
compress.cpp
native/jni/magiskboot/compress.cpp
+0
-1
main.cpp
native/jni/magiskboot/main.cpp
+0
-1
proc_monitor.cpp
native/jni/magiskhide/proc_monitor.cpp
+0
-1
magiskpolicy.cpp
native/jni/magiskpolicy/magiskpolicy.cpp
+0
-1
policydb.cpp
native/jni/magiskpolicy/policydb.cpp
+0
-1
rules.cpp
native/jni/magiskpolicy/rules.cpp
+1
-1
sepolicy.cpp
native/jni/magiskpolicy/sepolicy.cpp
+0
-1
statement.cpp
native/jni/magiskpolicy/statement.cpp
+0
-1
_resetprop.hpp
native/jni/resetprop/_resetprop.hpp
+0
-1
resetprop.cpp
native/jni/resetprop/resetprop.cpp
+0
-1
connect.cpp
native/jni/su/connect.cpp
+0
-1
pts.cpp
native/jni/su/pts.cpp
+1
-1
su_daemon.cpp
native/jni/su/su_daemon.cpp
+0
-1
cpio.cpp
native/jni/utils/cpio.cpp
+0
-1
utils.hpp
native/jni/utils/include/utils.hpp
+1
-0
logging.cpp
native/jni/utils/logging.cpp
+1
-1
logging.hpp
native/jni/utils/logging.hpp
+0
-0
misc.cpp
native/jni/utils/misc.cpp
+0
-1
stream.cpp
native/jni/utils/stream.cpp
+0
-1
xwrap.cpp
native/jni/utils/xwrap.cpp
+0
-1
No files found.
native/jni/core/socket.cpp
View file @
1e2f776b
...
@@ -5,7 +5,6 @@
...
@@ -5,7 +5,6 @@
#include <socket.hpp>
#include <socket.hpp>
#include <utils.hpp>
#include <utils.hpp>
#include <logging.hpp>
#define ABS_SOCKET_LEN(sun) (sizeof(sa_family_t) + strlen(sun->sun_path + 1) + 1)
#define ABS_SOCKET_LEN(sun) (sizeof(sa_family_t) + strlen(sun->sun_path + 1) + 1)
...
...
native/jni/include/magisk.hpp
View file @
1e2f776b
#pragma once
#pragma once
#include <logging.hpp>
#include <string>
#include <string>
#define MAIN_SOCKET "d30138f2310a9fb9c54a3e0c21f58591"
#define MAIN_SOCKET "d30138f2310a9fb9c54a3e0c21f58591"
...
...
native/jni/init/getinfo.cpp
View file @
1e2f776b
...
@@ -6,7 +6,6 @@
...
@@ -6,7 +6,6 @@
#include <vector>
#include <vector>
#include <utils.hpp>
#include <utils.hpp>
#include <logging.hpp>
#include "init.hpp"
#include "init.hpp"
...
...
native/jni/init/init.hpp
View file @
1e2f776b
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
#include <stdlib.h>
#include <stdlib.h>
#include <vector>
#include <vector>
#include <
logging
.hpp>
#include <
utils
.hpp>
struct
cmdline
{
struct
cmdline
{
bool
skip_initramfs
;
bool
skip_initramfs
;
...
...
native/jni/init/mount.cpp
View file @
1e2f776b
...
@@ -5,7 +5,6 @@
...
@@ -5,7 +5,6 @@
#include <vector>
#include <vector>
#include <utils.hpp>
#include <utils.hpp>
#include <logging.hpp>
#include <selinux.hpp>
#include <selinux.hpp>
#include <magisk.hpp>
#include <magisk.hpp>
...
...
native/jni/init/twostage.cpp
View file @
1e2f776b
#include <magisk.hpp>
#include <magisk.hpp>
#include <utils.hpp>
#include <utils.hpp>
#include <logging.hpp>
#include <socket.hpp>
#include <socket.hpp>
#include "init.hpp"
#include "init.hpp"
...
...
native/jni/magiskboot/bootimg.cpp
View file @
1e2f776b
...
@@ -10,7 +10,6 @@
...
@@ -10,7 +10,6 @@
#include <mincrypt/sha.h>
#include <mincrypt/sha.h>
#include <mincrypt/sha256.h>
#include <mincrypt/sha256.h>
#include <utils.hpp>
#include <utils.hpp>
#include <logging.hpp>
#include "bootimg.hpp"
#include "bootimg.hpp"
#include "magiskboot.hpp"
#include "magiskboot.hpp"
...
...
native/jni/magiskboot/compress.cpp
View file @
1e2f776b
...
@@ -13,7 +13,6 @@
...
@@ -13,7 +13,6 @@
#include <lz4frame.h>
#include <lz4frame.h>
#include <lz4hc.h>
#include <lz4hc.h>
#include <logging.hpp>
#include <utils.hpp>
#include <utils.hpp>
#include "magiskboot.hpp"
#include "magiskboot.hpp"
...
...
native/jni/magiskboot/main.cpp
View file @
1e2f776b
...
@@ -5,7 +5,6 @@
...
@@ -5,7 +5,6 @@
#include <sys/mman.h>
#include <sys/mman.h>
#include <mincrypt/sha.h>
#include <mincrypt/sha.h>
#include <logging.hpp>
#include <utils.hpp>
#include <utils.hpp>
#include "magiskboot.hpp"
#include "magiskboot.hpp"
...
...
native/jni/magiskhide/proc_monitor.cpp
View file @
1e2f776b
...
@@ -13,7 +13,6 @@
...
@@ -13,7 +13,6 @@
#include <vector>
#include <vector>
#include <bitset>
#include <bitset>
#include <logging.hpp>
#include <utils.hpp>
#include <utils.hpp>
#include "magiskhide.hpp"
#include "magiskhide.hpp"
...
...
native/jni/magiskpolicy/magiskpolicy.cpp
View file @
1e2f776b
#include <logging.hpp>
#include <utils.hpp>
#include <utils.hpp>
#include <magiskpolicy.hpp>
#include <magiskpolicy.hpp>
...
...
native/jni/magiskpolicy/policydb.cpp
View file @
1e2f776b
...
@@ -6,7 +6,6 @@
...
@@ -6,7 +6,6 @@
#include <cil/cil.h>
#include <cil/cil.h>
#include <utils.hpp>
#include <utils.hpp>
#include <logging.hpp>
#include <stream.hpp>
#include <stream.hpp>
#include <magiskpolicy.hpp>
#include <magiskpolicy.hpp>
...
...
native/jni/magiskpolicy/rules.cpp
View file @
1e2f776b
#include <
logging
.hpp>
#include <
utils
.hpp>
#include <magiskpolicy.hpp>
#include <magiskpolicy.hpp>
#include "sepolicy.hpp"
#include "sepolicy.hpp"
...
...
native/jni/magiskpolicy/sepolicy.cpp
View file @
1e2f776b
#include <sepol/policydb/policydb.h>
#include <sepol/policydb/policydb.h>
#include <magiskpolicy.hpp>
#include <magiskpolicy.hpp>
#include <logging.hpp>
#include <utils.hpp>
#include <utils.hpp>
#include "sepolicy.hpp"
#include "sepolicy.hpp"
...
...
native/jni/magiskpolicy/statement.cpp
View file @
1e2f776b
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
#include <string>
#include <string>
#include <magiskpolicy.hpp>
#include <magiskpolicy.hpp>
#include <logging.hpp>
#include <utils.hpp>
#include <utils.hpp>
#include "sepolicy.hpp"
#include "sepolicy.hpp"
...
...
native/jni/resetprop/_resetprop.hpp
View file @
1e2f776b
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
#include <string>
#include <string>
#include <map>
#include <map>
#include <logging.hpp>
#include <system_properties.h>
#include <system_properties.h>
...
...
native/jni/resetprop/resetprop.cpp
View file @
1e2f776b
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
#include <vector>
#include <vector>
#include <map>
#include <map>
#include <logging.hpp>
#include <resetprop.hpp>
#include <resetprop.hpp>
#include <utils.hpp>
#include <utils.hpp>
...
...
native/jni/su/connect.cpp
View file @
1e2f776b
...
@@ -7,7 +7,6 @@
...
@@ -7,7 +7,6 @@
#include <daemon.hpp>
#include <daemon.hpp>
#include <utils.hpp>
#include <utils.hpp>
#include <logging.hpp>
#include "su.hpp"
#include "su.hpp"
...
...
native/jni/su/pts.cpp
View file @
1e2f776b
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
#include <errno.h>
#include <errno.h>
#include <pthread.h>
#include <pthread.h>
#include <
logging
.hpp>
#include <
utils
.hpp>
#include "pts.hpp"
#include "pts.hpp"
...
...
native/jni/su/su_daemon.cpp
View file @
1e2f776b
...
@@ -12,7 +12,6 @@
...
@@ -12,7 +12,6 @@
#include <sys/wait.h>
#include <sys/wait.h>
#include <sys/mount.h>
#include <sys/mount.h>
#include <logging.hpp>
#include <daemon.hpp>
#include <daemon.hpp>
#include <utils.hpp>
#include <utils.hpp>
#include <selinux.hpp>
#include <selinux.hpp>
...
...
native/jni/utils/cpio.cpp
View file @
1e2f776b
...
@@ -5,7 +5,6 @@
...
@@ -5,7 +5,6 @@
#include <algorithm>
#include <algorithm>
#include <utils.hpp>
#include <utils.hpp>
#include <logging.hpp>
#include <cpio.hpp>
#include <cpio.hpp>
using
namespace
std
;
using
namespace
std
;
...
...
native/jni/utils/include/utils.hpp
View file @
1e2f776b
...
@@ -4,3 +4,4 @@
...
@@ -4,3 +4,4 @@
#include "../xwrap.hpp"
#include "../xwrap.hpp"
#include "../files.hpp"
#include "../files.hpp"
#include "../misc.hpp"
#include "../misc.hpp"
#include "../logging.hpp"
native/jni/utils/logging.cpp
View file @
1e2f776b
#include <cstdio>
#include <cstdio>
#include <cstdlib>
#include <cstdlib>
#include
<logging.hpp>
#include
"logging.hpp"
#include <flags.hpp>
#include <flags.hpp>
using
namespace
std
;
using
namespace
std
;
...
...
native/jni/utils/
include/
logging.hpp
→
native/jni/utils/logging.hpp
View file @
1e2f776b
File moved
native/jni/utils/misc.cpp
View file @
1e2f776b
...
@@ -15,7 +15,6 @@
...
@@ -15,7 +15,6 @@
#include <random>
#include <random>
#include <string>
#include <string>
#include <logging.hpp>
#include <utils.hpp>
#include <utils.hpp>
using
namespace
std
;
using
namespace
std
;
...
...
native/jni/utils/stream.cpp
View file @
1e2f776b
#include <utils.hpp>
#include <utils.hpp>
#include <logging.hpp>
#include <stream.hpp>
#include <stream.hpp>
static
int
strm_read
(
void
*
v
,
char
*
buf
,
int
len
)
{
static
int
strm_read
(
void
*
v
,
char
*
buf
,
int
len
)
{
...
...
native/jni/utils/xwrap.cpp
View file @
1e2f776b
...
@@ -10,7 +10,6 @@
...
@@ -10,7 +10,6 @@
#include <sys/mman.h>
#include <sys/mman.h>
#include <sys/sendfile.h>
#include <sys/sendfile.h>
#include <logging.hpp>
#include <utils.hpp>
#include <utils.hpp>
using
namespace
std
;
using
namespace
std
;
...
...
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