mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-02-22 20:48:33 +07:00
Made android module load only when SDK defined
This commit is contained in:
parent
de6681d00a
commit
605d50166a
10
.travis.yml
10
.travis.yml
@ -1,14 +1,6 @@
|
|||||||
language: android
|
|
||||||
jdk:
|
jdk:
|
||||||
- openjdk8
|
- 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:
|
script:
|
||||||
- "./gradlew test"
|
- "./gradlew test"
|
||||||
- "./gradlew desktop:dist"
|
- "./gradlew desktop:dist"
|
||||||
|
@ -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(System.properties["release"] == null || System.properties["release"] == "false"){
|
||||||
if (new File(settingsDir, '../uCore').exists()) {
|
if (new File(settingsDir, '../uCore').exists()) {
|
||||||
|
Loading…
Reference in New Issue
Block a user