From c2e66220161119efad2d20283f4a53111e9c5b85 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Thu, 2 Jul 2020 04:16:02 -0700 Subject: [PATCH] Update README Recommend Android Studio embedded JDK again --- README.MD | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/README.MD b/README.MD index e240cce8f..ed520c8da 100644 --- a/README.MD +++ b/README.MD @@ -13,14 +13,13 @@ Here are some feature highlights: - **Magisk Modules**: Modify read-only partitions by installing modules - **MagiskHide**: Hide Magisk from root detections / system integrity checks -## Download +## Downloads [![](https://img.shields.io/badge/Magisk%20Manager-v7.5.1-green)](https://github.com/topjohnwu/Magisk/releases/download/manager-v7.5.1/MagiskManager-v7.5.1.apk) -[![](https://img.shields.io/badge/Magisk-v20.4-blue)](https://github.com/topjohnwu/Magisk/releases/download/v20.4/Magisk-v20.4.zip) -[![](https://img.shields.io/badge/Magisk-uninstaller-red)](https://github.com/topjohnwu/Magisk/releases/download/v20.4/Magisk-uninstaller-20200323.zip) +[![](https://img.shields.io/badge/Magisk%20Manager-Canary-red)](https://raw.githubusercontent.com/topjohnwu/magisk_files/canary/app-debug.apk)
-[![](https://img.shields.io/badge/Magisk%20Beta-v20.4-blue)](https://github.com/topjohnwu/Magisk/releases/download/v20.4/Magisk-v20.4.zip) -[![](https://img.shields.io/badge/Magisk%20Manager-Canary-green)](https://raw.githubusercontent.com/topjohnwu/magisk_files/canary/app-debug.apk) +[![](https://img.shields.io/badge/Magisk-v20.4-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v20.4) +[![](https://img.shields.io/badge/Magisk%20Beta-v20.4-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v20.4) ## Useful Links @@ -53,7 +52,10 @@ For Magisk Manager crashes, record and upload the logcat when the crash occurs. - Clone sources: `git clone --recurse-submodules https://github.com/topjohnwu/Magisk.git` - Install Python 3.6+ \ (Windows only: select **'Add Python to PATH'** in installer, and run `pip install colorama` after install) -- Install JDK 9+. Tested on JDK 14. +- Configure to use the JDK bundled in Android Studio: + - 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) - 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.