catch up with features etc. that must be on to not crash opening a game

xwords4/android/XWords4-bt/jni/Android.mk

@@ -4,40 +4,52 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 COMMON_PATH=../../../common
-local_C_INCLUDES+= \
+LOCAL_C_INCLUDES+= \
 	-I$(LOCAL_PATH)/$(COMMON_PATH) \
 	-I$(LOCAL_PATH)/../../../relay \
 
-local_LDLIBS += -llog
+LOCAL_LDLIBS += -llog
 
-local_DEBUG = -DMEM_DEBUG -DDEBUG -DENABLE_LOGGING
-local_DEFINES += \
-	$(local_DEBUG) \
+ifeq ($(BUILD_TARGET),debug)
+	LOCAL_DEBUG = -DMEM_DEBUG -DDEBUG -DENABLE_LOGGING -DCOMMS_CHECKSUM -Wno-unused-but-set-variable
+endif
+LOCAL_DEFINES += \
+	$(LOCAL_DEBUG) \
 	-DXWFEATURE_RELAY \
 	-DXWFEATURE_BLUETOOTH \
 	-DXWFEATURE_SMS \
+	-DXWFEATURE_COMMSACK \
 	-DXWFEATURE_TURNCHANGENOTIFY \
-	-DXWFEATURE_CHAT \
 	-DCOMMS_XPORT_FLAGSPROC \
 	-DKEY_SUPPORT \
 	-DXWFEATURE_CROSSHAIRS \
 	-DPOINTER_SUPPORT \
 	-DSCROLL_DRAG_THRESHHOLD=1 \
 	-DDROP_BITMAPS \
-	-DDISABLE_EMPTYTRAY_UNDO \
+	-DXWFEATURE_TRAYUNDO_ONE \
 	-DDISABLE_TILE_SEL \
 	-DXWFEATURE_BOARDWORDS \
 	-DXWFEATURE_WALKDICT \
 	-DXWFEATURE_WALKDICT_FILTER \
 	-DXWFEATURE_DICTSANITY \
 	-DFEATURE_TRAY_EDIT \
+	-DXWFEATURE_BONUSALL \
 	-DMAX_ROWS=32 \
-	-DINITIAL_CLIENT_VERS=2 \
-	-DRELAY_ROOM_DEFAULT=\"\"\
+	-DHASH_STREAM \
+	-DXWFEATURE_BASE64 \
+	-DXWFEATURE_DEVID \
+	-DCOMMON_LAYOUT \
+	-DINITIAL_CLIENT_VERS=${INITIAL_CLIENT_VERS} \
+	-DRELAY_ROOM_DEFAULT=\"\" \
 	-D__LITTLE_ENDIAN \
 
+ifeq ($(CHAT_ENABLED),true)
+	LOCAL_DEFINES += -DXWFEATURE_CHAT
+endif
 
-local_SRC_FILES +=         \
+#	-DXWFEATURE_SCOREONEPASS \
+
+LOCAL_SRC_FILES +=         \
 	xwjni.c                \
 	utilwrapper.c          \
 	drawwrapper.c          \
@@ -48,7 +60,7 @@ local_SRC_FILES +=         \
 
 
 COMMON_PATH=../../../common
-common_SRC_FILES +=        \
+COMMON_SRC_FILES +=        \
 	$(COMMON_PATH)/boarddrw.c   \
 	$(COMMON_PATH)/scorebdp.c   \
 	$(COMMON_PATH)/dragdrpp.c   \
@@ -71,11 +83,12 @@ common_SRC_FILES +=        \
 	$(COMMON_PATH)/dbgutil.c    \
 
 
-LOCAL_CFLAGS+=$(local_C_INCLUDES) $(local_DEFINES) -Wall
-LOCAL_SRC_FILES := $(linux_SRC_FILES) $(local_SRC_FILES) $(common_SRC_FILES)
+LOCAL_CFLAGS+=$(LOCAL_C_INCLUDES) $(LOCAL_DEFINES) -Wall
+LOCAL_SRC_FILES := $(linux_SRC_FILES) $(LOCAL_SRC_FILES) $(COMMON_SRC_FILES)
 LOCAL_MODULE    := xwjni
-LOCAL_LDLIBS := -L${SYSROOT}/usr/lib -llog -lz 
+LOCAL_LDLIBS 	:= -L${SYSROOT}/usr/lib -llog -lz 
 
 include $(BUILD_SHARED_LIBRARY)
 
-
+COMMON_SRC_FILES :=
+COMMON_PATH :=