Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix cleanupDuplicatesInCore task; disable D8

Browse source
This commit is contained in:
Alex Sytnyk 2018-08-07 19:55:21 +03:00
parent 8041aebb02
commit 0e5bf69cd3
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/build.gradle
View file

@ -311,6 +311,8 @@ task cleanupDuplicatesInCore() {
dependsOn buildOsmAndCore dependsOn buildOsmAndCore
// doesn't work for legacy debug builds // doesn't work for legacy debug builds
doLast { doLast {
file("libgnustl/arm64-v8a").mkdirs()
file("libs/arm64-v8a/libgnustl_shared.so").renameTo(file("libgnustl/arm64-v8a/libgnustl_shared.so"))
file("libgnustl/armeabi").mkdirs() file("libgnustl/armeabi").mkdirs()
file("libs/armeabi/libgnustl_shared.so").renameTo(file("libgnustl/armeabi/libgnustl_shared.so")) file("libs/armeabi/libgnustl_shared.so").renameTo(file("libgnustl/armeabi/libgnustl_shared.so"))
file("libgnustl/armeabi-v7a").mkdirs() file("libgnustl/armeabi-v7a").mkdirs()

3
gradle.properties
View file

@ -17,4 +17,5 @@
# for enableD8=true min sdk must be > 22 # for enableD8=true min sdk must be > 22
# UPDATE: temporairly commented since gradle plugin updated to 3.1.3 and claims INSTALL_FAILED_DEXOPT is fixed # UPDATE: temporairly commented since gradle plugin updated to 3.1.3 and claims INSTALL_FAILED_DEXOPT is fixed
# android.enableD8=false # UPDATE 2: D8 causes problems on arm64 devices with Android 6.0 (API 23)
android.enableD8=false