From 813669fafb4273a1c88ed7ba7bad8841da55e7d0 Mon Sep 17 00:00:00 2001 From: Eric House Date: Thu, 29 Nov 2018 12:55:35 -0800 Subject: [PATCH] include X86 native library again It's a pain to have to change code to run in Genymotion, and to have upgrade not testable using Genymotion. Consider verting this change before next release. --- xwords4/android/app/build.gradle | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle index e49c1dab1..21bc531e4 100644 --- a/xwords4/android/app/build.gradle +++ b/xwords4/android/app/build.gradle @@ -231,7 +231,12 @@ task copyStrings(type: Exec) { task ndkSetup(type: Exec) { workingDir '../' // remove ', "--arm-only"' for Genymotion builds - commandLine "./scripts/ndksetup.sh", "--with-clang", "--arm-only" + + // I'm putting ARM back for a while. It's too much trouble having + // builds, including those built by travis, that don't run on the + // emulator. Maybe remove this change before each release? + commandLine "./scripts/ndksetup.sh", "--with-clang" + // commandLine "./scripts/ndksetup.sh", "--with-clang", "--arm-only" } task myPreBuild(dependsOn: ['ndkSetup', 'mkImages', 'copyStrings', 'mkXml']) {