From 06ff720d66019b8c937d75b39eed5d84410601e6 Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@trand>
Date: Sat, 31 Mar 2012 09:39:24 -0700
Subject: [PATCH] fix so SMS works and remove some BT stuff

---
 .../android/XWords4-sms/AndroidManifest.xml   |  2 -
 xwords4/android/XWords4-sms/jni/.gitignore    |  1 -
 xwords4/android/XWords4-sms/jni/Android.mk    | 79 +++++++++++++++++++
 .../src/org/eehouse/android/xw4sms/XWApp.java |  2 +-
 4 files changed, 80 insertions(+), 4 deletions(-)
 create mode 100644 xwords4/android/XWords4-sms/jni/Android.mk

diff --git a/xwords4/android/XWords4-sms/AndroidManifest.xml b/xwords4/android/XWords4-sms/AndroidManifest.xml
index abd9080c7..233e8ac36 100644
--- a/xwords4/android/XWords4-sms/AndroidManifest.xml
+++ b/xwords4/android/XWords4-sms/AndroidManifest.xml
@@ -33,8 +33,6 @@
   <uses-permission android:name="android.permission.VIBRATE" />
   <uses-permission android:name="android.permission.RECEIVE_SMS" /> 
   <uses-permission android:name="android.permission.SEND_SMS" />
-  <uses-permission android:name="android.permission.BLUETOOTH" />
-  <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
   <uses-permission android:name="android.permission.READ_CONTACTS" />
 
   <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="7" />
diff --git a/xwords4/android/XWords4-sms/jni/.gitignore b/xwords4/android/XWords4-sms/jni/.gitignore
index f773cd73e..21d3e19ca 100644
--- a/xwords4/android/XWords4-sms/jni/.gitignore
+++ b/xwords4/android/XWords4-sms/jni/.gitignore
@@ -1,7 +1,6 @@
 anddict.c
 anddict.h
 andglobals.h
-Android.mk
 andutils.c
 andutils.h
 drawwrapper.c
diff --git a/xwords4/android/XWords4-sms/jni/Android.mk b/xwords4/android/XWords4-sms/jni/Android.mk
new file mode 100644
index 000000000..3808d152d
--- /dev/null
+++ b/xwords4/android/XWords4-sms/jni/Android.mk
@@ -0,0 +1,79 @@
+# -*- mode: Makefile; compile-command: "cd ../; ${NDK_ROOT}/ndk-build -j3"; -*-
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+COMMON_PATH=../../../common
+local_C_INCLUDES+= \
+	-I$(LOCAL_PATH)/$(COMMON_PATH) \
+	-I$(LOCAL_PATH)/../../../relay \
+
+local_LDLIBS += -llog
+
+# local_DEBUG = -DMEM_DEBUG -DDEBUG -DENABLE_LOGGING
+local_DEFINES += \
+	$(local_DEBUG) \
+	-DXWFEATURE_RELAY \
+	-DXWFEATURE_SMS \
+	-DXWFEATURE_TURNCHANGENOTIFY \
+	-DXWFEATURE_CHAT \
+	-DCOMMS_XPORT_FLAGSPROC \
+	-DKEY_SUPPORT \
+	-DXWFEATURE_CROSSHAIRS \
+	-DPOINTER_SUPPORT \
+	-DSCROLL_DRAG_THRESHHOLD=1 \
+	-DDROP_BITMAPS \
+	-DDISABLE_EMPTYTRAY_UNDO \
+	-DDISABLE_TILE_SEL \
+	-DXWFEATURE_BOARDWORDS \
+	-DXWFEATURE_WALKDICT \
+	-DXWFEATURE_WALKDICT_FILTER \
+	-DXWFEATURE_DICTSANITY \
+	-DFEATURE_TRAY_EDIT \
+	-DNODE_CAN_4 \
+	-DRELAY_ROOM_DEFAULT=\"\"\
+	-D__LITTLE_ENDIAN \
+
+
+local_SRC_FILES +=         \
+	xwjni.c                \
+	utilwrapper.c          \
+	drawwrapper.c          \
+	xportwrapper.c         \
+	anddict.c              \
+	andutils.c             \
+	jniutlswrapper.c       \
+
+
+COMMON_PATH=../../../common
+common_SRC_FILES +=        \
+	$(COMMON_PATH)/boarddrw.c   \
+	$(COMMON_PATH)/scorebdp.c   \
+	$(COMMON_PATH)/dragdrpp.c   \
+	$(COMMON_PATH)/pool.c       \
+	$(COMMON_PATH)/tray.c       \
+	$(COMMON_PATH)/dictnry.c    \
+	$(COMMON_PATH)/dictiter.c   \
+	$(COMMON_PATH)/mscore.c     \
+	$(COMMON_PATH)/vtabmgr.c    \
+	$(COMMON_PATH)/strutils.c   \
+	$(COMMON_PATH)/engine.c     \
+	$(COMMON_PATH)/board.c      \
+	$(COMMON_PATH)/mempool.c    \
+	$(COMMON_PATH)/game.c       \
+	$(COMMON_PATH)/server.c     \
+	$(COMMON_PATH)/model.c      \
+	$(COMMON_PATH)/comms.c      \
+	$(COMMON_PATH)/memstream.c  \
+	$(COMMON_PATH)/movestak.c   \
+	$(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_MODULE    := xwjni
+LOCAL_LDLIBS := -L${SYSROOT}/usr/lib -llog -lz 
+
+include $(BUILD_SHARED_LIBRARY)
+
+
diff --git a/xwords4/android/XWords4-sms/src/org/eehouse/android/xw4sms/XWApp.java b/xwords4/android/XWords4-sms/src/org/eehouse/android/xw4sms/XWApp.java
index 56bf032e1..ebe1de05f 100644
--- a/xwords4/android/XWords4-sms/src/org/eehouse/android/xw4sms/XWApp.java
+++ b/xwords4/android/XWords4-sms/src/org/eehouse/android/xw4sms/XWApp.java
@@ -30,7 +30,7 @@ import org.eehouse.android.xw4sms.jni.XwJNI;
 public class XWApp extends Application {
 
     public static final boolean BTSUPPORTED = false;
-    public static final boolean SMSSUPPORTED = false;
+    public static final boolean SMSSUPPORTED = true;
 
     private static UUID s_UUID = null;
     private static Boolean s_onEmulator = null;