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
2da5fcb0
Commit
2da5fcb0
authored
Oct 17, 2020
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ANDROID_HOME is deprecated
parent
a079966f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
README.MD
README.MD
+1
-1
build.gradle.kts
build.gradle.kts
+1
-1
build.py
build.py
+3
-3
No files found.
README.MD
View file @
2da5fcb0
...
@@ -56,7 +56,7 @@ For Magisk Manager crashes, record and upload the logcat when the crash occurs.
...
@@ -56,7 +56,7 @@ For Magisk Manager crashes, record and upload the logcat when the crash occurs.
-
macOS:
`export JAVA_HOME="/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home"`
-
macOS:
`export JAVA_HOME="/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home"`
-
Linux:
`export PATH="/path/to/androidstudio/jre/bin:$PATH"`
-
Linux:
`export PATH="/path/to/androidstudio/jre/bin:$PATH"`
-
Windows: Add
`C:\Path\To\Android Studio\jre\bin`
to environment variable
`PATH`
-
Windows: Add
`C:\Path\To\Android Studio\jre\bin`
to environment variable
`PATH`
-
Set environment variable
`ANDROID_
HOME
`
to the Android SDK folder (can be found in Android Studio settings)
-
Set environment variable
`ANDROID_
SDK_ROOT
`
to the Android SDK folder (can be found in Android Studio settings)
-
Run
`./build.py ndk`
to let the script download and install NDK for you
-
Run
`./build.py ndk`
to let the script download and install NDK for you
-
Set configurations in
`config.prop`
. A sample
`config.prop.sample`
is provided.
-
Set configurations in
`config.prop`
. A sample
`config.prop.sample`
is provided.
-
To start building, run
`build.py`
to see your options.
\
-
To start building, run
`build.py`
to see your options.
\
...
...
build.gradle.kts
View file @
2da5fcb0
...
@@ -64,7 +64,7 @@ subprojects {
...
@@ -64,7 +64,7 @@ subprojects {
android
.
apply
{
android
.
apply
{
compileSdkVersion
(
30
)
compileSdkVersion
(
30
)
buildToolsVersion
=
"30.0.2"
buildToolsVersion
=
"30.0.2"
ndkPath
=
"${System.getenv("
ANDROID_
HOME
")}/ndk/magisk"
ndkPath
=
"${System.getenv("
ANDROID_
SDK_ROOT
")}/ndk/magisk"
defaultConfig
{
defaultConfig
{
if
(
minSdkVersion
==
null
)
if
(
minSdkVersion
==
null
)
...
...
build.py
View file @
2da5fcb0
...
@@ -27,8 +27,8 @@ def vprint(str):
...
@@ -27,8 +27,8 @@ def vprint(str):
if
not
sys
.
version_info
>=
(
3
,
6
):
if
not
sys
.
version_info
>=
(
3
,
6
):
error
(
'Requires Python 3.6+'
)
error
(
'Requires Python 3.6+'
)
if
'ANDROID_
HOME
'
not
in
os
.
environ
:
if
'ANDROID_
SDK_ROOT
'
not
in
os
.
environ
:
error
(
'Please add Android SDK path to ANDROID_
HOME
environment variable!'
)
error
(
'Please add Android SDK path to ANDROID_
SDK_ROOT
environment variable!'
)
try
:
try
:
subprocess
.
run
([
'javac'
,
'-version'
],
subprocess
.
run
([
'javac'
,
'-version'
],
...
@@ -58,7 +58,7 @@ default_targets = ['magisk', 'magiskinit', 'magiskboot', 'busybox']
...
@@ -58,7 +58,7 @@ default_targets = ['magisk', 'magiskinit', 'magiskboot', 'busybox']
ndk_ver
=
'21d'
ndk_ver
=
'21d'
ndk_ver_full
=
'21.3.6528147'
ndk_ver_full
=
'21.3.6528147'
ndk_root
=
op
.
join
(
os
.
environ
[
'ANDROID_
HOME
'
],
'ndk'
)
ndk_root
=
op
.
join
(
os
.
environ
[
'ANDROID_
SDK_ROOT
'
],
'ndk'
)
ndk_path
=
op
.
join
(
ndk_root
,
'magisk'
)
ndk_path
=
op
.
join
(
ndk_root
,
'magisk'
)
ndk_build
=
op
.
join
(
ndk_path
,
'ndk-build'
)
ndk_build
=
op
.
join
(
ndk_path
,
'ndk-build'
)
gradlew
=
op
.
join
(
'.'
,
'gradlew'
+
(
'.bat'
if
is_windows
else
''
))
gradlew
=
op
.
join
(
'.'
,
'gradlew'
+
(
'.bat'
if
is_windows
else
''
))
...
...
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