From 1a80c33a16594e9a7182887a911ed44c9fbc9f79 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Mon, 2 Feb 2015 21:40:22 +0100
Subject: GlueGen: Adapt APK install scripts for harmonized os.and.arch names,
 see commit 3b43a223253176731567c6d8b7a67c9a6110782b

---
 make/scripts/adb-install-all-aarch64.sh     | 2 ++
 make/scripts/adb-install-all-arm64-v8a.sh   | 2 --
 make/scripts/adb-install-all-armv6.sh       | 2 +-
 make/scripts/adb-install-all-armv7.sh       | 2 --
 make/scripts/adb-reinstall-all-aarch64.sh   | 5 +++++
 make/scripts/adb-reinstall-all-arm64-v8a.sh | 5 -----
 make/scripts/adb-reinstall-all-armv7.sh     | 5 -----
 7 files changed, 8 insertions(+), 15 deletions(-)
 create mode 100755 make/scripts/adb-install-all-aarch64.sh
 delete mode 100755 make/scripts/adb-install-all-arm64-v8a.sh
 delete mode 100755 make/scripts/adb-install-all-armv7.sh
 create mode 100755 make/scripts/adb-reinstall-all-aarch64.sh
 delete mode 100755 make/scripts/adb-reinstall-all-arm64-v8a.sh
 delete mode 100755 make/scripts/adb-reinstall-all-armv7.sh

diff --git a/make/scripts/adb-install-all-aarch64.sh b/make/scripts/adb-install-all-aarch64.sh
new file mode 100755
index 0000000..7f1de25
--- /dev/null
+++ b/make/scripts/adb-install-all-aarch64.sh
@@ -0,0 +1,2 @@
+adb $* install ../build-android-aarch64/jogamp-android-launcher.apk
+adb $* install ../build-android-aarch64/gluegen-rt-android-aarch64.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 46bf24b..0000000
--- a/make/scripts/adb-install-all-arm64-v8a.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-adb $* install ../build-android-aarch64/jogamp-android-launcher.apk
-adb $* install ../build-android-aarch64/gluegen-rt-android-arm64-v8a.apk
diff --git a/make/scripts/adb-install-all-armv6.sh b/make/scripts/adb-install-all-armv6.sh
index 866881c..e2754c2 100755
--- a/make/scripts/adb-install-all-armv6.sh
+++ b/make/scripts/adb-install-all-armv6.sh
@@ -1,2 +1,2 @@
 adb $* install ../build-android-armv6/jogamp-android-launcher.apk
-adb $* install ../build-android-armv6/gluegen-rt-android-armeabi.apk
+adb $* install ../build-android-armv6/gluegen-rt-android-armv6.apk
diff --git a/make/scripts/adb-install-all-armv7.sh b/make/scripts/adb-install-all-armv7.sh
deleted file mode 100755
index 9a0e4f7..0000000
--- a/make/scripts/adb-install-all-armv7.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-adb $* install ../build-android-armv7/jogamp-android-launcher.apk
-adb $* install ../build-android-armv7/gluegen-rt-android-armeabi-v7a.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 $*
-
diff --git a/make/scripts/adb-reinstall-all-armv7.sh b/make/scripts/adb-reinstall-all-armv7.sh
deleted file mode 100755
index 2cb7713..0000000
--- a/make/scripts/adb-reinstall-all-armv7.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-sdir=`dirname $0`
-
-$sdir/adb-uninstall-all.sh $*
-$sdir/adb-install-all-armv7.sh $*
-
-- 
cgit v1.2.3