Updates for Android build

This commit is contained in:
Aaron Culliney 2015-05-10 14:06:20 -07:00
parent 5ec12f2e08
commit fe8aa03360
2 changed files with 14 additions and 13 deletions

View File

@ -7,7 +7,7 @@ android {
defaultConfig {
applicationId "org.deadc0de.apple2ix"
minSdkVersion 10
targetSdkVersion 10
targetSdkVersion 21
versionCode 1
versionName "0.9.1"
ndk {
@ -16,7 +16,7 @@ android {
}
signingConfigs {
release {
storeFile file("release.keystore")
storeFile file("release2.keystore")
storePassword System.getenv("GOOGSTOREPWD")
keyPassword System.getenv("GOOGKEYPWD")
keyAlias "release"

View File

@ -90,18 +90,19 @@ else
ln -s apple2ix.mk Android.mk
fi
ndk-build V=1 NDK_DEBUG=1 && \
ant -f ../build.xml debug
ndk-build V=1 NDK_DEBUG=1
#ndk-build V=1 NDK_DEBUG=1 && \
# ant -f ../build.xml debug
if test "x$do_load" = "x1" ; then
ant -f ../build.xml debug install
fi
if test "x$do_debug" = "x1" ; then
( cd .. && ndk-gdb.py --force --start )
elif test "x$do_load" = "x1" ; then
adb shell am start -a android.intent.action.MAIN -n $package_id/.Apple2Activity
fi
#if test "x$do_load" = "x1" ; then
# ant -f ../build.xml debug install
#fi
#
#if test "x$do_debug" = "x1" ; then
# ( cd .. && ndk-gdb.py --force --start )
#elif test "x$do_load" = "x1" ; then
# adb shell am start -a android.intent.action.MAIN -n $package_id/.Apple2Activity
#fi
set +x