Commit graph

338 commits

Author SHA1 Message Date
Eric House
ba712046a2 add git version to file in assets/ so can tell .apk's version in
filesystem (before it's installed).
2016-01-03 19:27:33 -08:00
Eric House
22dde029c8 Merge tag 'android_beta_100' into android_branch
ready for release
2016-01-03 11:36:37 -08:00
Eric House
6ce1fbe465 add red Dbg to the middle of variant's icon 2015-12-30 05:53:37 -08:00
Eric House
db9c079356 fix to show files appearing in only one apk 2015-12-05 11:13:13 -08:00
Eric House
4e14477faf script to compare .apk files, meant to aid in confirming that gradle
and ant are producing the same thing.
2015-12-04 21:51:10 -08:00
Eric House
58bf3ba07b Merge remote-tracking branch 'maidu2/android_branch' into android_branch
Conflicts:
	xwords4/android/XWords4/.gitignore
	xwords4/android/XWords4/build.gradle
	xwords4/android/scripts/common_targets.xml
2015-11-11 22:36:19 -08:00
Eric House
aa11bb50de fix to work with modified script 2015-11-11 22:23:39 -08:00
Eric House
adbc3615c1 changes to run under gradle 2015-11-11 18:59:00 -08:00
Eric House
9f28e5c350 more gradle improvements. Seems to build a usable .apk, but isn't
doing release/debug right yet.
2015-11-05 20:19:07 -08:00
Eric House
5d81b3375b add support for fetching devIDs for connnames, required to allow
inviting based on existing relay games.
2015-10-15 06:32:11 -07:00
Eric House
122335c53c Merge branch 'android_branch' into relay_noconn
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-09-17 07:00:04 -07:00
Eric House
34ecd92ff5 script to copy translation data from android_translate branch 2015-09-16 07:01:09 -07:00
Eric House
f3d8f0b8ee pass V=1 to ndk build script to make cc calls verbose 2015-09-15 20:57:39 -07:00
Eric House
05d0974823 Merge remote-tracking branch 'origin/android_branch' into android_branch
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-09-15 20:46:35 -07:00
Eric House
759cd36162 Merge branch 'android_branch' of ssh://git.code.sf.net/p/xwords/git into android_branch
Conflicts:
	xwords4/android/XWords4-dbg/AndroidManifest.xml
	xwords4/android/scripts/mkvariant.sh
2015-09-10 18:34:28 -07:00
Eric House
be44613773 Merge branch 'android_branch' into relay_noconn
Conflicts:
	xwords4/android/XWords4/archive/R.java
2015-08-27 07:53:14 -07:00
Eric House
8e17e43d9a fix to not stop removing after removing the first elem 2015-08-27 06:41:47 -07:00
Eric House
690f248e27 ignore case where no files exist (so that /* doesn't expand) 2015-08-24 07:39:24 -07:00
Eric House
c35acdd773 ignore case where no files exist (so that /* doesn't expand) 2015-08-24 07:35:00 -07:00
Eric House
daaa346bb5 generate local.properties if running for first time 2015-08-24 07:24:28 -07:00
Eric House
f7f4825c67 deal with case where file doesn't exist 2015-08-16 09:25:00 -07:00
Eric House
265ac48b88 Merge branch 'android_branch' into relay_noconn
Conflicts:
	xwords4/android/XWords4-dbg/AndroidManifest.xml
	xwords4/android/XWords4-dbg/res/layout/.gitignore
	xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore
2015-08-10 07:37:03 -07:00
Eric House
2ef407320e pick package based on location 2015-08-10 06:43:19 -07:00
Eric House
87e3108296 cleanup: make work based on location if target not specified 2015-08-10 06:23:24 -07:00
Eric House
134ef851f6 generate local.properties if running for first time 2015-08-06 21:01:15 -07:00
Eric House
8b90f211ed progress: compares english and other languages use of format
specifiers, but I think is missing mismatches in plurals still.
2015-08-05 07:19:39 -07:00
Eric House
ec581d1dbd Merge branch 'android_branch' into relay_noconn
Conflicts:
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/jni/Android.mk
	xwords4/android/XWords4/jni/xwjni.c
	xwords4/android/XWords4/res/values/common_rsrc.xml
2015-08-04 20:17:56 -07:00
Eric House
97ebdd0d63 copy changes over from android_translate branch 2015-08-04 20:15:38 -07:00
Eric House
adceab1ed1 name change 2015-08-04 20:15:00 -07:00
Eric House
c83d3368ad allow using script for any project with an AndroidManifest.xml 2015-08-03 04:58:34 -07:00
Eric House
a5f332dd1d different logging TAG for different variants 2015-08-03 04:57:35 -07:00
Eric House
6871ef24a6 move several strings, including app name, NBS port, and url prefix, into generated
.xml file so Dbg and regular variants can co-exist better

Conflicts:
	xwords4/android/XWords4/archive/R.java
2015-08-03 04:55:59 -07:00
Eric House
b500a4646d use different uuid for dbg variant so it's not cross-sending BT
messages with other variants, causing among other problems spurious
"deleted on other device" warnings.
2015-08-03 04:50:56 -07:00
Eric House
7875d34757 allow using script for any project with an AndroidManifest.xml 2015-08-02 14:15:14 -07:00
Eric House
af8c6d618d different logging TAG for different variants 2015-08-02 10:29:17 -07:00
Eric House
0425df7a5e move several strings, including app name, NBS port, and url prefix, into generated
.xml file so Dbg and regular variants can co-exist better
2015-08-01 22:39:00 -07:00
Eric House
65606607ab use different uuid for dbg variant so it's not cross-sending BT
messages with other variants, causing among other problems spurious
"deleted on other device" warnings.
2015-07-29 19:48:56 -07:00
Eric House
dfc3ca5289 Merge branch 'android_branch' into relay_noconn 2015-07-29 05:54:10 -07:00
Eric House
a2705ca821 uninstall dbg variant too 2015-07-28 21:01:46 -07:00
Eric House
aa78ec2701 echo name of new .apk for easier scping 2015-07-27 07:29:09 -07:00
Eric House
82f1406df7 incorporate git rev number in name of debug .apk 2015-07-27 07:28:58 -07:00
Eric House
fc904af928 echo name of new .apk for easier scping 2015-07-27 07:26:32 -07:00
Eric House
85bd8ec2d4 merge 2015-07-27 07:16:28 -07:00
Eric House
7cc58de6e5 Merge branch 'android_branch' of ssh://git.code.sf.net/p/xwords/git into android_branch
Conflicts:
	xwords4/android/scripts/info.py
2015-07-27 07:14:54 -07:00
Eric House
e31c7ae4f5 update to not notify of debug build updates when version matches what's installed 2015-07-27 07:12:44 -07:00
Eric House
fe91c9e04e update to serve newest debug as well as release builds, and to know about variants 2015-07-25 21:56:48 -07:00
Eric House
ca71118c8d incorporate git rev number in name of debug .apk 2015-07-25 20:54:07 -07:00
Eric House
59ab1736ca include res_src in set of directories copied for -dbg variant 2015-07-25 08:21:44 -07:00
Eric House
9e533f82db remove redundant constant 2015-07-21 06:55:43 -07:00
Eric House
f626d6ca4c remove redundant constant 2015-07-21 06:55:15 -07:00