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
4c8f3579
Commit
4c8f3579
authored
Jul 08, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update to support updated FrankeNDK
parent
4bb2fd6b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
6 deletions
+4
-6
build.py
build.py
+3
-3
Android.mk
native/jni/Android.mk
+1
-0
Application.mk
native/jni/Application.mk
+0
-3
No files found.
build.py
View file @
4c8f3579
...
@@ -218,9 +218,6 @@ def build_binary(args):
...
@@ -218,9 +218,6 @@ def build_binary(args):
with
open
(
bin_file
,
'rb'
)
as
src
:
with
open
(
bin_file
,
'rb'
)
as
src
:
binary_dump
(
src
,
out
,
'magisk_xz'
)
binary_dump
(
src
,
out
,
'magisk_xz'
)
if
'busybox'
in
args
.
target
:
run_ndk_build
(
'B_BB=1'
)
if
'magiskinit'
in
args
.
target
:
if
'magiskinit'
in
args
.
target
:
if
not
os
.
path
.
exists
(
os
.
path
.
join
(
'native'
,
'out'
,
'x86'
,
'binaries_arch.h'
)):
if
not
os
.
path
.
exists
(
os
.
path
.
join
(
'native'
,
'out'
,
'x86'
,
'binaries_arch.h'
)):
error
(
'Build "magisk" before building "magiskinit"'
)
error
(
'Build "magisk" before building "magiskinit"'
)
...
@@ -235,6 +232,9 @@ def build_binary(args):
...
@@ -235,6 +232,9 @@ def build_binary(args):
if
'magiskboot'
in
args
.
target
:
if
'magiskboot'
in
args
.
target
:
run_ndk_build
(
'B_BOOT=1'
)
run_ndk_build
(
'B_BOOT=1'
)
if
'busybox'
in
args
.
target
:
run_ndk_build
(
'B_BB=1'
)
if
'test'
in
args
.
target
:
if
'test'
in
args
.
target
:
run_ndk_build
(
'B_TEST=1 B_64BIT=1'
)
run_ndk_build
(
'B_TEST=1 B_64BIT=1'
)
...
...
native/jni/Android.mk
View file @
4c8f3579
...
@@ -160,6 +160,7 @@ LOCAL_C_INCLUDES := \
...
@@ -160,6 +160,7 @@ LOCAL_C_INCLUDES := \
jni/include \
jni/include \
$(LIBUTILS)
$(LIBUTILS)
LOCAL_SRC_FILES := test.cpp
LOCAL_SRC_FILES := test.cpp
LOCAL_LDFLAGS := -static
include $(BUILD_EXECUTABLE)
include $(BUILD_EXECUTABLE)
endif
endif
...
...
native/jni/Application.mk
View file @
4c8f3579
...
@@ -17,8 +17,5 @@ endif
...
@@ -17,8 +17,5 @@ endif
# Busybox require some additional settings
# Busybox require some additional settings
ifdef B_BB
ifdef B_BB
APP_CFLAGS := -Os -fomit-frame-pointer -flto
APP_SHORT_COMMANDS := true
NDK_TOOLCHAIN_VERSION := 4.9
APP_PLATFORM := android-21
APP_PLATFORM := android-21
endif
endif
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