Fix cleanupDuplicatesInCore task; disable D8
(cherry picked from commit 0e5bf69
)
This commit is contained in:
parent
965d60aadb
commit
222e4f3c01
2 changed files with 4 additions and 1 deletions
|
@ -311,6 +311,8 @@ task cleanupDuplicatesInCore() {
|
|||
dependsOn buildOsmAndCore
|
||||
// doesn't work for legacy debug builds
|
||||
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("libs/armeabi/libgnustl_shared.so").renameTo(file("libgnustl/armeabi/libgnustl_shared.so"))
|
||||
file("libgnustl/armeabi-v7a").mkdirs()
|
||||
|
|
|
@ -17,4 +17,5 @@
|
|||
|
||||
# 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
|
||||
# android.enableD8=false
|
||||
# UPDATE 2: D8 causes problems on arm64 devices with Android 6.0 (API 23)
|
||||
android.enableD8=false
|
||||
|
|
Loading…
Reference in a new issue