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
2f1f68f1
Commit
2f1f68f1
authored
Apr 03, 2020
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prepare compilation for NDK r21
parent
2742edd7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
busybox
native/jni/external/busybox
+1
-1
init.cpp
native/jni/init/init.cpp
+3
-3
prop_info.cpp
native/jni/systemproperties/prop_info.cpp
+1
-1
No files found.
busybox
@
04d8621f
Subproject commit
172151eb0dd8c774459beaf6b116c63f8cf528aa
Subproject commit
04d8621fd3eb6d5e2863924daca49d37f89a2f09
native/jni/init/init.cpp
View file @
2f1f68f1
...
@@ -102,7 +102,7 @@ static void decompress_ramdisk() {
...
@@ -102,7 +102,7 @@ static void decompress_ramdisk() {
uint8_t
*
buf
;
uint8_t
*
buf
;
size_t
sz
;
size_t
sz
;
mmap_ro
(
ramdisk_xz
,
buf
,
sz
);
mmap_ro
(
ramdisk_xz
,
buf
,
sz
);
int
fd
=
open
(
tmp
,
O_WRONLY
|
O_CREAT
|
O_TRUNC
|
O_CLOEXEC
);
int
fd
=
xopen
(
tmp
,
O_WRONLY
|
O_CREAT
|
O_TRUNC
|
O_CLOEXEC
,
0644
);
unxz
(
fd
,
buf
,
sz
);
unxz
(
fd
,
buf
,
sz
);
munmap
(
buf
,
sz
);
munmap
(
buf
,
sz
);
close
(
fd
);
close
(
fd
);
...
@@ -113,7 +113,7 @@ static void decompress_ramdisk() {
...
@@ -113,7 +113,7 @@ static void decompress_ramdisk() {
}
}
int
dump_magisk
(
const
char
*
path
,
mode_t
mode
)
{
int
dump_magisk
(
const
char
*
path
,
mode_t
mode
)
{
int
fd
=
open
(
path
,
O_WRONLY
|
O_CREAT
|
O_TRUNC
|
O_CLOEXEC
,
mode
);
int
fd
=
x
open
(
path
,
O_WRONLY
|
O_CREAT
|
O_TRUNC
|
O_CLOEXEC
,
mode
);
if
(
fd
<
0
)
if
(
fd
<
0
)
return
1
;
return
1
;
if
(
!
unxz
(
fd
,
magisk_xz
,
sizeof
(
magisk_xz
)))
if
(
!
unxz
(
fd
,
magisk_xz
,
sizeof
(
magisk_xz
)))
...
@@ -123,7 +123,7 @@ int dump_magisk(const char *path, mode_t mode) {
...
@@ -123,7 +123,7 @@ int dump_magisk(const char *path, mode_t mode) {
}
}
static
int
dump_manager
(
const
char
*
path
,
mode_t
mode
)
{
static
int
dump_manager
(
const
char
*
path
,
mode_t
mode
)
{
int
fd
=
open
(
path
,
O_WRONLY
|
O_CREAT
|
O_TRUNC
|
O_CLOEXEC
,
mode
);
int
fd
=
x
open
(
path
,
O_WRONLY
|
O_CREAT
|
O_TRUNC
|
O_CLOEXEC
,
mode
);
if
(
fd
<
0
)
if
(
fd
<
0
)
return
1
;
return
1
;
if
(
!
unxz
(
fd
,
manager_xz
,
sizeof
(
manager_xz
)))
if
(
!
unxz
(
fd
,
manager_xz
,
sizeof
(
manager_xz
)))
...
...
native/jni/systemproperties/prop_info.cpp
View file @
2f1f68f1
...
@@ -47,7 +47,7 @@ prop_info::prop_info(const char* name, uint32_t namelen, uint32_t long_offset) {
...
@@ -47,7 +47,7 @@ prop_info::prop_info(const char* name, uint32_t namelen, uint32_t long_offset) {
memcpy
(
this
->
name
,
name
,
namelen
);
memcpy
(
this
->
name
,
name
,
namelen
);
this
->
name
[
namelen
]
=
'\0'
;
this
->
name
[
namelen
]
=
'\0'
;
a
uto
error_value_len
=
sizeof
(
kLongLegacyError
)
-
1
;
a
tomic_uint_least32_t
error_value_len
=
sizeof
(
kLongLegacyError
)
-
1
;
atomic_init
(
&
this
->
serial
,
error_value_len
<<
24
|
kLongFlag
);
atomic_init
(
&
this
->
serial
,
error_value_len
<<
24
|
kLongFlag
);
memcpy
(
this
->
long_property
.
error_message
,
kLongLegacyError
,
sizeof
(
kLongLegacyError
));
memcpy
(
this
->
long_property
.
error_message
,
kLongLegacyError
,
sizeof
(
kLongLegacyError
));
...
...
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