mirror of
https://github.com/Anuken/Mindustry.git
synced 2024-09-11 08:15:35 +03:00
Re-added android module in IntelliJ
This commit is contained in:
parent
5113f8770f
commit
a8da0bfcbf
@ -4,13 +4,6 @@ if(JavaVersion.current().ordinal() < JavaVersion.VERSION_16.ordinal()){
|
|||||||
|
|
||||||
include 'desktop', 'core', 'server', 'ios', 'annotations', 'tools', 'tests'
|
include 'desktop', 'core', 'server', 'ios', 'annotations', 'tools', 'tests'
|
||||||
|
|
||||||
def use = { ... names ->
|
|
||||||
for(String name : names){
|
|
||||||
include(name)
|
|
||||||
project(name).projectDir = new File(settingsDir, "../${name.substring(1).replace(":", "/")}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
def hasSdk = System.getenv("ANDROID_HOME") != null
|
def hasSdk = System.getenv("ANDROID_HOME") != null
|
||||||
|
|
||||||
if(new File(settingsDir, 'local.properties').exists()){
|
if(new File(settingsDir, 'local.properties').exists()){
|
||||||
@ -26,9 +19,7 @@ if(hasSdk){
|
|||||||
//why? because IntelliJ chokes on the new version of the Android plugin
|
//why? because IntelliJ chokes on the new version of the Android plugin
|
||||||
|
|
||||||
//UPDATE: it no longer chokes on AGP with the latest version, but instead gives a completely different error. brilliant.
|
//UPDATE: it no longer chokes on AGP with the latest version, but instead gives a completely different error. brilliant.
|
||||||
if(!System.getProperty("jna.tmpdir")?.contains("JetBrains")){
|
|
||||||
include 'android'
|
include 'android'
|
||||||
}
|
|
||||||
}else{
|
}else{
|
||||||
println("No Android SDK found. Skipping Android module.")
|
println("No Android SDK found. Skipping Android module.")
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user