From 310227184051a3fd69e50d62208898c7671aeca1 Mon Sep 17 00:00:00 2001 From: Eric House Date: Sun, 21 Mar 2021 13:40:17 -0700 Subject: [PATCH] turn "known players" on for all --- xwords4/android/app/build.gradle | 6 +----- xwords4/android/jni/Android.mk | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle index 03c4271e7..f276c1f90 100644 --- a/xwords4/android/app/build.gradle +++ b/xwords4/android/app/build.gradle @@ -110,7 +110,7 @@ android { buildConfigField "boolean", "ATTACH_SUPPORTED", "false" buildConfigField "boolean", "OFFER_MQTT", "true" buildConfigField "boolean", "NON_RELEASE", "DEBUG || !IS_TAGGED_BUILD" - buildConfigField "boolean", "HAVE_KNOWN_PLAYERS", "false" + buildConfigField "boolean", "HAVE_KNOWN_PLAYERS", "true" buildConfigField "boolean", "FOR_FDROID", "false" buildConfigField "boolean", "HAVE_PASSWORD", "false" } @@ -164,8 +164,6 @@ android { resValue "string", "nfc_aid", "$NFC_AID_XW4d" externalNativeBuild.ndkBuild.cFlags += ['-DVARIANT_xw4d'] externalNativeBuild.ndkBuild.arguments += ['XW_BT_UUID=' + XWD_UUID] - externalNativeBuild.ndkBuild.cFlags += ['-DXWFEATURE_KNOWNPLAYERS'] - buildConfigField "boolean", "HAVE_KNOWN_PLAYERS", "true" } xw4dGPlay { @@ -184,8 +182,6 @@ android { resValue "string", "nfc_aid", "$NFC_AID_XW4d" externalNativeBuild.ndkBuild.cFlags += ['-DVARIANT_xw4dGPlay'] externalNativeBuild.ndkBuild.arguments += ['XW_BT_UUID=' + XWD_UUID] - externalNativeBuild.ndkBuild.cFlags += ['-DXWFEATURE_KNOWNPLAYERS'] - buildConfigField "boolean", "HAVE_KNOWN_PLAYERS", "true" } xw4Foss { diff --git a/xwords4/android/jni/Android.mk b/xwords4/android/jni/Android.mk index 8cc0a5b96..92deb7b11 100644 --- a/xwords4/android/jni/Android.mk +++ b/xwords4/android/jni/Android.mk @@ -39,6 +39,7 @@ LOCAL_DEFINES += \ -DHASH_STREAM \ -DXWFEATURE_DEVID \ -DXWFEATURE_CHAT \ + -DXWFEATURE_KNOWNPLAYERS \ -DCOMMON_LAYOUT \ -DXWFEATURE_WIDER_COLS \ -DNATIVE_NLI \