From 0c15a0000e110debb77984998acd18093c752804 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 4 Dec 2013 20:32:15 -0800
Subject: [PATCH] pass package to script so can work from variants

---
 xwords4/android/XWords4/build.xml    | 6 ++++--
 xwords4/android/scripts/gen_gcmid.sh | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/xwords4/android/XWords4/build.xml b/xwords4/android/XWords4/build.xml
index 1f029b80e..6c1689be8 100644
--- a/xwords4/android/XWords4/build.xml
+++ b/xwords4/android/XWords4/build.xml
@@ -85,8 +85,10 @@
 
         <exec dir="." executable="../scripts/gen_gcmid.sh"
               output="src/org/eehouse/android/xw4/GCMConsts.java"
-              logError="true"
-              />
+              logError="true" failonerror="true"
+              >
+          <arg value="xw4"/>
+          </exec>
         <exec dir=".." executable="./scripts/genvers.sh" output="ant_out.txt">
           <arg value="XWords4"/>
           <arg value="xw4"/>
diff --git a/xwords4/android/scripts/gen_gcmid.sh b/xwords4/android/scripts/gen_gcmid.sh
index bf719f2ab..35e289b48 100755
--- a/xwords4/android/scripts/gen_gcmid.sh
+++ b/xwords4/android/scripts/gen_gcmid.sh
@@ -8,10 +8,12 @@ if [ -z "$GCM_SENDER_ID" ]; then
     echo "GCM_SENDER_ID empty; GCM use will be disabled" >&2
 fi
 
+PKG=$1
+
 cat <<EOF
 // Auto-generated: DO NOT CHECK THIS IN until questions about
 // obscuring the id are cleared up
-package org.eehouse.android.xw4;
+package org.eehouse.android.$PKG;
 
 public class GCMConsts {
     public static final String SENDER_ID = "${GCM_SENDER_ID}";