From 77b70f92df3a7151126a5e4ad1be0b5deef3477a Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Mon, 2 Feb 2015 22:12:22 +0100 Subject: Adapt APK install scripts for harmonized os.and.arch names, see GlueGen commit 3b43a223253176731567c6d8b7a67c9a6110782b --- make/build.xml | 2 +- make/scripts/adb-install-all-aarch64.sh | 4 ++++ make/scripts/adb-install-all-arm64-v8a.sh | 4 ---- make/scripts/adb-install-all-armv6.sh | 4 ++-- make/scripts/adb-reinstall-all-aarch64.sh | 5 +++++ make/scripts/adb-reinstall-all-arm64-v8a.sh | 5 ----- 6 files changed, 12 insertions(+), 12 deletions(-) create mode 100755 make/scripts/adb-install-all-aarch64.sh delete mode 100755 make/scripts/adb-install-all-arm64-v8a.sh create mode 100755 make/scripts/adb-reinstall-all-aarch64.sh delete mode 100755 make/scripts/adb-reinstall-all-arm64-v8a.sh diff --git a/make/build.xml b/make/build.xml index e876cc4..edb8933 100755 --- a/make/build.xml +++ b/make/build.xml @@ -163,7 +163,7 @@ - + diff --git a/make/scripts/adb-install-all-aarch64.sh b/make/scripts/adb-install-all-aarch64.sh new file mode 100755 index 0000000..0244dbd --- /dev/null +++ b/make/scripts/adb-install-all-aarch64.sh @@ -0,0 +1,4 @@ +#adb $* install ../build-android-aarch64/jogamp-android-launcher.apk +#adb $* install ../build-android-aarch64/gluegen-rt-android-aarch64.apk +adb $* install ../build-android-aarch64/jar/joal-android-aarch64.apk +adb $* install ../build-android-aarch64/jar/joal-test-android.apk diff --git a/make/scripts/adb-install-all-arm64-v8a.sh b/make/scripts/adb-install-all-arm64-v8a.sh deleted file mode 100755 index a8df126..0000000 --- a/make/scripts/adb-install-all-arm64-v8a.sh +++ /dev/null @@ -1,4 +0,0 @@ -#adb $* install ../build-android-aarch64/jogamp-android-launcher.apk -#adb $* install ../build-android-aarch64/gluegen-rt-android-arm64-v8a.apk -adb $* install ../build-android-aarch64/jar/joal-android-arm64-v8a.apk -adb $* install ../build-android-aarch64/jar/joal-test-android.apk diff --git a/make/scripts/adb-install-all-armv6.sh b/make/scripts/adb-install-all-armv6.sh index f527ccc..358969b 100755 --- a/make/scripts/adb-install-all-armv6.sh +++ b/make/scripts/adb-install-all-armv6.sh @@ -1,4 +1,4 @@ #adb $* install ../../gluegen/build-android-armv6/jogamp-android-launcher.apk -#adb $* install ../../gluegen/build-android-armv6/gluegen-rt-android-armeabi.apk -adb $* install ../build-android-armv6/jar/joal-android-armeabi.apk +#adb $* install ../../gluegen/build-android-armv6/gluegen-rt-android-armv6.apk +adb $* install ../build-android-armv6/jar/joal-android-armv6.apk adb $* install ../build-android-armv6/jar/joal-test-android.apk diff --git a/make/scripts/adb-reinstall-all-aarch64.sh b/make/scripts/adb-reinstall-all-aarch64.sh new file mode 100755 index 0000000..e27a1e9 --- /dev/null +++ b/make/scripts/adb-reinstall-all-aarch64.sh @@ -0,0 +1,5 @@ +sdir=`dirname $0` + +$sdir/adb-uninstall-all.sh $* +$sdir/adb-install-all-aarch64.sh $* + diff --git a/make/scripts/adb-reinstall-all-arm64-v8a.sh b/make/scripts/adb-reinstall-all-arm64-v8a.sh deleted file mode 100755 index 2627cc8..0000000 --- a/make/scripts/adb-reinstall-all-arm64-v8a.sh +++ /dev/null @@ -1,5 +0,0 @@ -sdir=`dirname $0` - -$sdir/adb-uninstall-all.sh $* -$sdir/adb-install-all-arm64-v8a.sh $* - -- cgit v1.2.3