diff --git a/xwords4/android/XWords4/jni/Android.mk b/xwords4/android/XWords4/jni/Android.mk index f026e552c..a6524d807 100644 --- a/xwords4/android/XWords4/jni/Android.mk +++ b/xwords4/android/XWords4/jni/Android.mk @@ -43,11 +43,10 @@ LOCAL_DEFINES += \ -D__LITTLE_ENDIAN \ ifeq ($(CHAT_ENABLED),true) - LOCAL_DEFINES += -DXWFEATURE_CHAT endif ifeq ($(THUMBNAIL_ENABLED),true) - local_DEFINES += -DXWFEATURE_ACTIVERECT + LOCAL_DEFINES += -DXWFEATURE_ACTIVERECT endif # -DXWFEATURE_SCOREONEPASS \ diff --git a/xwords4/android/XWords4/jni/Application.mk b/xwords4/android/XWords4/jni/Application.mk deleted file mode 100644 index 7a1599bb9..000000000 --- a/xwords4/android/XWords4/jni/Application.mk +++ /dev/null @@ -1 +0,0 @@ -APP_ABI := armeabi x86 diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java index 71230c064..f0c0f7d21 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java @@ -154,7 +154,6 @@ public class BoardCanvas extends Canvas implements DrawCtx { R.string.bonus_w2x_summary , R.string.bonus_l3x_summary, R.string.bonus_w3x_summary }; - res = activity.getResources(); for ( int ii = 0; ii < ids.length; ++ii ) { m_bonusSummaries[ ii+1 ] = res.getString( ids[ii] ); }