From 605d50166a1d859cc9a864a0e04e70e6902dce7f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 24 Oct 2018 13:07:51 -0400
Subject: [PATCH] Made android module load only when SDK defined

---
 .travis.yml     | 10 +---------
 settings.gradle | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c97c9646db..c8349974ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,6 @@
-language: android
+
 jdk:
 - openjdk8
-android:
-  components:
-  - android-28
-  - extra-google-google_play_services
-  - extra-google-m2repository
-  - extra-android-m2repository
-  - addon-google_apis-google-28
-  - build-tools-28.0.3
 script:
 - "./gradlew test"
 - "./gradlew desktop:dist"
diff --git a/settings.gradle b/settings.gradle
index 43aa98978e..5621bab462 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,18 @@
-include 'desktop', 'html', 'core', 'android', 'kryonet', 'server', 'ios', 'annotations', 'tools', 'tests'
+include 'desktop', 'html', 'core', 'kryonet', 'server', 'ios', 'annotations', 'tools', 'tests'
+
+Properties properties = new Properties()
+
+if(new File(settingsDir, 'local.properties').exists()){
+    properties.load(new File(settingsDir, 'local.properties').newDataInputStream())
+
+    if(properties.containsKey("sdk.dir")){
+        include 'android'
+    }else{
+        println("No android SDK dir found Not loading Android module.")
+    }
+}else{
+    println("No local.properties found. Not loading Android module.")
+}
 
 if(System.properties["release"] == null || System.properties["release"] == "false"){
     if (new File(settingsDir, '../uCore').exists()) {