Skip to content

Commit fa13d10

Browse files
committed
Buildscript fixes
1 parent 8069a7b commit fa13d10

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

android/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,11 @@ android{
4040
renderscript.srcDirs = ['src']
4141
res.srcDirs = ['res']
4242
assets.srcDirs = ['assets', 'src/main/assets', '../core/assets/']
43-
jniLibs.srcDirs = ['libs']
43+
4444
if(localArc){
4545
jniLibs.srcDirs += ['../../Arc/natives/natives-android/libs', '../../Arc/natives/natives-freetype-android/libs']
46+
}else{
47+
jniLibs.srcDirs = ['libs']
4648
}
4749
}
4850

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if(hasSdk){
2020
println("No Android SDK found. Skipping Android module.")
2121
}
2222

23-
if(!hasProperty("release") && !hasProperty("noLocalArc")){
23+
if(!hasProperty("noLocalArc")){
2424
if(new File(rootDir.parent, 'Arc').exists()){
2525
println("Compiling with localArc")
2626
includeBuild("../Arc")

0 commit comments

Comments
 (0)