Adapt APK install scripts for harmonized os.and.arch names, see GlueGen commit 3b43a223253176731567c6d8b7a67c9a6110782b

9 files changed, 9 insertions, 72 deletions

diff --git a/make/build-common.xml b/make/build-common.xml
index a601dc792..89353ccd0 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -447,7 +447,7 @@
         <property name="jogl-all-noawt.jar"             value="${jar}/jogl-all-noawt.jar" />
         <property name="jogl-all-mobile.jar"            value="${jar}/jogl-all-mobile.jar" />
         <property name="jogl-all-android.jar"           value="${jar}/jogl-all-android.jar" />
-        <property name="jogl-all-android.apk"           value="${jar}/jogl-all-android-${android.abi}.apk" />
+        <property name="jogl-all-android.apk"           value="${jar}/jogl-all-${os.and.arch}.apk" />
 
         <!-- JavaSE combinations . JOAL (optional) -->
         <property name="joal.jar"                       value="${build.joal}/jar/joal.jar" />
diff --git a/make/scripts/adb-install-all-aarch64.sh b/make/scripts/adb-install-all-aarch64.sh
new file mode 100755
index 000000000..0572817bf
--- /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/jogl-all-android-aarch64.apk
+adb $* install ../build-android-aarch64/jar/jogl-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 083313ca9..000000000
--- 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/jogl-all-android-arm64-v8a.apk
-adb $* install ../build-android-aarch64/jar/jogl-test-android.apk
diff --git a/make/scripts/adb-install-all-armv6.sh b/make/scripts/adb-install-all-armv6.sh
index 0ba9f3ca0..be890b197 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/jogl-all-android-armeabi.apk
+#adb $* install ../../gluegen/build-android-armv6/gluegen-rt-android-armv6.apk
+adb $* install ../build-android-armv6/jar/jogl-all-android-armv6.apk
 adb $* install ../build-android-armv6/jar/jogl-test-android.apk
diff --git a/make/scripts/adb-install-all-armv7.sh b/make/scripts/adb-install-all-armv7.sh
deleted file mode 100755
index f0a1dc522..000000000
--- a/make/scripts/adb-install-all-armv7.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#adb $* install ../../gluegen/build-android-armv7/jogamp-android-launcher.apk
-#adb $* install ../../gluegen/build-android-armv7/gluegen-rt-android-armeabi-v7a.apk
-adb $* install ../build-android-armv7/jar/jogl-all-android-armeabi-v7a.apk
-adb $* install ../build-android-armv7/jar/jogl-test-android.apk
diff --git a/make/scripts/adb-reinstall-all-armv7.sh b/make/scripts/adb-reinstall-all-aarch64.sh
index 2cb7713dc..e27a1e929 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 2627cc83f..000000000
--- 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-uninstall-all.sh b/make/scripts/adb-uninstall-all.sh
index ba9d603bc..af40b5129 100755
--- a/make/scripts/adb-uninstall-all.sh
+++ b/make/scripts/adb-uninstall-all.sh
@@ -1,4 +1,5 @@
 #adb $* uninstall jogamp.android.launcher
 #adb $* uninstall com.jogamp.common
+adb $* uninstall javax.media.opengl
 adb $* uninstall com.jogamp.opengl
 adb $* uninstall com.jogamp.opengl.test
diff --git a/make/scripts/make.jogl.all.android-armv7-cross.sh b/make/scripts/make.jogl.all.android-armv7-cross.sh
deleted file mode 100755
index ab546fa13..000000000
--- a/make/scripts/make.jogl.all.android-armv7-cross.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh
-
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
-fi
-
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-android-tools.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-android-tools.sh
-fi
-
-export NODE_LABEL=.
-
-export HOST_UID=jogamp
-# jogamp02 - 10.1.0.122
-export HOST_IP=10.1.0.122
-export HOST_RSYNC_ROOT=PROJECTS/JOGL
-
-export TARGET_UID=jogamp
-export TARGET_IP=panda02
-#export TARGET_IP=jautab03
-#export TARGET_IP=jauphone04
-export TARGET_ADB_PORT=5555
-# needs executable bit (probably su)
-export TARGET_ROOT=/data/projects
-export TARGET_ANT_HOME=/usr/share/ant
-
-export ANDROID_VERSION=9
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
-
-#export GCC_VERSION=4.4.3
-export GCC_VERSION=4.8
-HOST_ARCH=linux-x86_64
-export TARGET_TRIPLE=arm-linux-androideabi
-
-export NDK_TOOLCHAIN_ROOT=$NDK_ROOT/toolchains/${TARGET_TRIPLE}-${GCC_VERSION}/prebuilt/${HOST_ARCH}
-export TARGET_PLATFORM_ROOT=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-arm
-
-# Need to add toolchain bins to the PATH. 
-export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH"
-
-export GLUEGEN_CPPTASKS_FILE=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-android-armv7.xml
-
-#export JUNIT_DISABLED="true"
-#export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
-
-#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
-export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
-
-# BUILD_ARCHIVE=true \
-ant \
-    -Drootrel.build=build-android-armv7 \
-    $* 2>&1 | tee -a make.jogl.all.android-armv7-cross.log
-