From 4a838a399cad033a7c6283e504508bfaeb7db28e Mon Sep 17 00:00:00 2001
From: Mygod <contact-github@mygod.be>
Date: Thu, 17 Jan 2019 17:04:39 +0800
Subject: [PATCH] Simplify building

---
 README.md                                | 2 --
 app/build.gradle                         | 2 ++
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 1763b22..ddd871d 100644
--- a/README.md
+++ b/README.md
@@ -20,8 +20,6 @@
 
 You can check whether the latest commit builds under UNIX environment by checking CI status.
 
-* Set environment variable `ANDROID_HOME` to `/path/to/android-sdk`
-* (optional) Set environment variable `ANDROID_NDK_HOME` to `/path/to/android-ndk` (default: `$ANDROID_HOME/ndk-bundle`)
 * Clone the repo using `git clone --recurse-submodules <repo>` or update submodules using `git submodule update --init --recursive`
 * Build it using Android Studio or gradle script
 
diff --git a/app/build.gradle b/app/build.gradle
index 32fedec..c70fd01 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -50,6 +50,8 @@ task goBuild(type: Exec) {
     } else {
         executable "sh"
         args "-c", "src/make.bash " + minSdkVersion
+        environment "ANDROID_HOME", android.sdkDirectory
+        environment "ANDROID_NDK_HOME", android.ndkDirectory
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3a9cf05..3c52baf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip