Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-20 22:26:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

remove x86 from jni; that chip's dead on Android

Browse source
This commit is contained in:
Eric House 2018-08-01 07:37:33 -07:00
parent e0c6621bfe
commit f1c2eb79d4
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/app/build.gradle
View file

@ -223,7 +223,7 @@ task copyStrings(type: Exec) {
task ndkSetup(type: Exec) { task ndkSetup(type: Exec) {
workingDir '../' workingDir '../'
commandLine "./scripts/ndksetup.sh", "--with-clang" commandLine "./scripts/ndksetup.sh", "--with-clang", "--arm-only"
} }
task myPreBuild(dependsOn: ['ndkSetup', 'mkImages', 'copyStrings', 'mkXml']) { task myPreBuild(dependsOn: ['ndkSetup', 'mkImages', 'copyStrings', 'mkXml']) {

5
xwords4/android/scripts/ndksetup.sh
View file

@ -36,10 +36,11 @@ echo "# Generated by $0; do not edit!!!" > $TMP_MK
[ -n "$USE_CLANG" ] && echo "NDK_TOOLCHAIN_VERSION := clang" >> $TMP_MK [ -n "$USE_CLANG" ] && echo "NDK_TOOLCHAIN_VERSION := clang" >> $TMP_MK
# TODO: reserach whether armeabi-v7a is better here
if [ -n "$XWORDS_DEBUG_ARMONLY" ]; then if [ -n "$XWORDS_DEBUG_ARMONLY" ]; then
echo "APP_ABI := armeabi-v7a" >> $TMP_MK echo "APP_ABI := armeabi" >> $TMP_MK
elif [ -n "$XWORDS_DEBUG_X86ONLY" ]; then elif [ -n "$XWORDS_DEBUG_X86ONLY" ]; then
echo "APP_ABI := x86" >> $TMP_MK echo "APP_ABI := x86" >> $TMP_MK
else else
echo "APP_ABI := armeabi x86" >> $TMP_MK echo "APP_ABI := armeabi x86" >> $TMP_MK
fi fi