aboutsummaryrefslogtreecommitdiffstats
path: root/make/scripts
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2015-02-02 22:12:22 +0100
committerSven Gothel <[email protected]>2015-02-02 22:12:22 +0100
commit77b70f92df3a7151126a5e4ad1be0b5deef3477a (patch)
tree4c6881cd48ebc565ce4efbabbd57b789619ce5af /make/scripts
parent232aee061552a4091fce7368ea8bc9bba8e404ff (diff)
Adapt APK install scripts for harmonized os.and.arch names, see GlueGen commit 3b43a223253176731567c6d8b7a67c9a6110782b
Diffstat (limited to 'make/scripts')
-rwxr-xr-xmake/scripts/adb-install-all-aarch64.sh4
-rwxr-xr-xmake/scripts/adb-install-all-arm64-v8a.sh4
-rwxr-xr-xmake/scripts/adb-install-all-armv6.sh4
-rwxr-xr-xmake/scripts/adb-reinstall-all-aarch64.sh (renamed from make/scripts/adb-reinstall-all-arm64-v8a.sh)2
4 files changed, 7 insertions, 7 deletions
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-arm64-v8a.sh b/make/scripts/adb-reinstall-all-aarch64.sh
index 2627cc8..e27a1e9 100755
--- a/make/scripts/adb-reinstall-all-arm64-v8a.sh
+++ b/make/scripts/adb-reinstall-all-aarch64.sh
@@ -1,5 +1,5 @@
sdir=`dirname $0`
$sdir/adb-uninstall-all.sh $*
-$sdir/adb-install-all-arm64-v8a.sh $*
+$sdir/adb-install-all-aarch64.sh $*