Made android module load only when SDK defined

This commit is contained in:
Anuken 2018-10-24 13:07:51 -04:00
parent de6681d00a
commit 605d50166a
2 changed files with 16 additions and 10 deletions

View File

@ -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"

View File

@ -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()) {