mirror of
https://github.com/topjohnwu/Magisk.git
synced 2024-11-21 15:05:28 +00:00
ANDROID_HOME is deprecated
This commit is contained in:
parent
a079966f97
commit
2da5fcb00b
@ -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"`
|
||||
- Linux: `export PATH="/path/to/androidstudio/jre/bin:$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
|
||||
- Set configurations in `config.prop`. A sample `config.prop.sample` is provided.
|
||||
- To start building, run `build.py` to see your options. \
|
||||
|
@ -64,7 +64,7 @@ subprojects {
|
||||
android.apply {
|
||||
compileSdkVersion(30)
|
||||
buildToolsVersion = "30.0.2"
|
||||
ndkPath = "${System.getenv("ANDROID_HOME")}/ndk/magisk"
|
||||
ndkPath = "${System.getenv("ANDROID_SDK_ROOT")}/ndk/magisk"
|
||||
|
||||
defaultConfig {
|
||||
if (minSdkVersion == null)
|
||||
|
6
build.py
6
build.py
@ -27,8 +27,8 @@ def vprint(str):
|
||||
if not sys.version_info >= (3, 6):
|
||||
error('Requires Python 3.6+')
|
||||
|
||||
if 'ANDROID_HOME' not in os.environ:
|
||||
error('Please add Android SDK path to ANDROID_HOME environment variable!')
|
||||
if 'ANDROID_SDK_ROOT' not in os.environ:
|
||||
error('Please add Android SDK path to ANDROID_SDK_ROOT environment variable!')
|
||||
|
||||
try:
|
||||
subprocess.run(['javac', '-version'],
|
||||
@ -58,7 +58,7 @@ default_targets = ['magisk', 'magiskinit', 'magiskboot', 'busybox']
|
||||
ndk_ver = '21d'
|
||||
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_build = op.join(ndk_path, 'ndk-build')
|
||||
gradlew = op.join('.', 'gradlew' + ('.bat' if is_windows else ''))
|
||||
|
Loading…
Reference in New Issue
Block a user