diff --git a/android/wscript b/android/wscript index d59cfef6..7a5e889d 100644 --- a/android/wscript +++ b/android/wscript @@ -17,8 +17,9 @@ def build(bld): bld(features = 'android javac', srcdir = 'src', compat = '1.6', - name = 'xashdroid-src', + name = 'xashdroid', jni = 'lib', + keystore = bld.path.parent.find_node('debug.keystore'), debug = bld.env.D8_DEBUG, target_api = 19) return diff --git a/compile.sh b/compile.sh index e1b8868b..e0de4900 100755 --- a/compile.sh +++ b/compile.sh @@ -63,10 +63,14 @@ done # Run waf ./waf build -v|| exit 1 -# sign -cp build/android/xashdroid-src.apk xashdroid.apk +if [ "$BUILD_TYPE" != "debug" ]; then + # sign + cp build/android/xashdroid.apk xashdroid.apk -# :) -if [ "$USER" = "a1ba" ]; then - apksigner sign --ks ../myks.keystore xashdroid.apk + # :) + if [ "$USER" = "a1ba" ]; then + apksigner sign --ks ../myks.keystore xashdroid.apk + fi +else + cp build/android/xashdroid-signed.apk xashdroid.apk fi