From 4ae79f6f27e2e2fc61aaaa6bd4930a9aabf3ffe9 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Fri, 1 Nov 2013 21:16:52 -0700
Subject: [PATCH] apply contributed patch making Makefile variable naming match
 required conventions for CLEAR_VARS.

---
 xwords4/android/XWords4/jni/Android.mk | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/xwords4/android/XWords4/jni/Android.mk b/xwords4/android/XWords4/jni/Android.mk
index 83af1a2fc..b60f6f5eb 100644
--- a/xwords4/android/XWords4/jni/Android.mk
+++ b/xwords4/android/XWords4/jni/Android.mk
@@ -4,17 +4,17 @@ 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
 
 ifeq ($(BUILD_TARGET),debug)
-	local_DEBUG = -DMEM_DEBUG -DDEBUG -DENABLE_LOGGING -DCOMMS_CHECKSUM -Wno-unused-but-set-variable
+	LOCAL_DEBUG = -DMEM_DEBUG -DDEBUG -DENABLE_LOGGING -DCOMMS_CHECKSUM -Wno-unused-but-set-variable
 endif
-local_DEFINES += \
-	$(local_DEBUG) \
+LOCAL_DEFINES += \
+	$(LOCAL_DEBUG) \
 	-DXWFEATURE_RELAY \
 	-DXWFEATURE_SMS \
 	-DXWFEATURE_COMMSACK \
@@ -42,12 +42,13 @@ local_DEFINES += \
 	-D__LITTLE_ENDIAN \
 
 ifeq ($(CHAT_ENABLED),true)
-	local_DEFINES += -DXWFEATURE_CHAT
+
+	LOCAL_DEFINES += -DXWFEATURE_CHAT
 endif
 
 #	-DXWFEATURE_SCOREONEPASS \
 
-local_SRC_FILES +=         \
+LOCAL_SRC_FILES +=         \
 	xwjni.c                \
 	utilwrapper.c          \
 	drawwrapper.c          \
@@ -58,7 +59,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   \
@@ -81,9 +82,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)
+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)
+
+COMMON_SRC_FILES :=
+COMMON_PATH :=