aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2015-02-02 21:40:22 +0100
committerSven Gothel <[email protected]>2015-02-02 21:40:22 +0100
commit1a80c33a16594e9a7182887a911ed44c9fbc9f79 (patch)
tree36ca6376e55727f711ae92643cd5f7a805d24ac5
parent3b43a223253176731567c6d8b7a67c9a6110782b (diff)
GlueGen: Adapt APK install scripts for harmonized os.and.arch names, see commit 3b43a223253176731567c6d8b7a67c9a6110782b
-rwxr-xr-xmake/scripts/adb-install-all-aarch64.sh2
-rwxr-xr-xmake/scripts/adb-install-all-arm64-v8a.sh2
-rwxr-xr-xmake/scripts/adb-install-all-armv6.sh2
-rwxr-xr-xmake/scripts/adb-install-all-armv7.sh2
-rwxr-xr-xmake/scripts/adb-reinstall-all-aarch64.sh (renamed from make/scripts/adb-reinstall-all-armv7.sh)2
-rwxr-xr-xmake/scripts/adb-reinstall-all-arm64-v8a.sh5
6 files changed, 4 insertions, 11 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..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-armv7.sh b/make/scripts/adb-reinstall-all-aarch64.sh
index 2cb7713..e27a1e9 100755
--- a/make/scripts/adb-reinstall-all-armv7.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-armv7.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 $*
-