aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2015-02-03 00:26:33 +0100
committerSven Gothel <[email protected]>2015-02-03 00:26:33 +0100
commitb81b9e14f24de0cbc66ab500afe0f8db7a058b96 (patch)
tree5f2c957cf03e381ba94217c867c8752f1b714be2
parent84a5372eda5da00a1c4ce51d9d9faea68523dbd6 (diff)
Adapt APK install scripts for harmonized os.and.arch names, see GlueGen commit 3b43a223253176731567c6d8b7a67c9a6110782b
-rw-r--r--make/build.xml4
-rwxr-xr-xmake/scripts/adb-install-all-aarch64.sh (renamed from make/scripts/adb-install-all-arm64-v8a.sh)4
-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/build.xml b/make/build.xml
index 0136199e..9954c160 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -201,7 +201,7 @@
<!-- The resulting jocl.jar. -->
<property name="jocl.jar" value="${build}/jar/jocl.jar" />
<property name="jocl-android.jar" value="${build}/jar/jocl-android.jar" />
- <property name="jocl-android.apk" value="${build}/jar/jocl-android-${android.abi}.apk" />
+ <property name="jocl-android.apk" value="${build}/jar/jocl-${os.and.arch}.apk" />
<path id="jocl_all.classpath">
<pathelement location="${gluegen-rt.jar}" />
@@ -747,7 +747,7 @@
<srcfiles dir= "." includes="*.xml"/>
<srcfiles dir= "${src.java}" includes="**"/>
<srcfiles dir= "${src.generated}" includes="**"/>
- <mapper type="merge" to="${build}/jar/jocl-android-${android.abi}.apk"/>
+ <mapper type="merge" to="${build}/jar/jocl-${os.and.arch}.apk"/>
</uptodate>
</target>
diff --git a/make/scripts/adb-install-all-arm64-v8a.sh b/make/scripts/adb-install-all-aarch64.sh
index 6e34b00d..edeff37b 100755
--- a/make/scripts/adb-install-all-arm64-v8a.sh
+++ b/make/scripts/adb-install-all-aarch64.sh
@@ -1,4 +1,4 @@
#adb $* install ../../gluegen/build-android-aarch64/jogamp-android-launcher.apk
-#adb $* install ../../gluegen/build-android-aarch64/gluegen-rt-android-arm64-v8a.apk
-adb $* install ../build-android-aarch64/jar/jocl-android-arm64-v8a.apk
+#adb $* install ../../gluegen/build-android-aarch64/gluegen-rt-android-aarch64.apk
+adb $* install ../build-android-aarch64/jar/jocl-android-aarch64.apk
adb $* install ../build-android-aarch64/jar/jocl-test-android.apk
diff --git a/make/scripts/adb-install-all-armv6.sh b/make/scripts/adb-install-all-armv6.sh
index 3abd89c6..1666110f 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/jocl-android-armeabi.apk
+#adb $* install ../../gluegen/build-android-armv6/gluegen-rt-android-armv6.apk
+adb $* install ../build-android-armv6/jar/jocl-android-armv6.apk
adb $* install ../build-android-armv6/jar/jocl-test-android.apk
diff --git a/make/scripts/adb-reinstall-all-arm64-v8a.sh b/make/scripts/adb-reinstall-all-aarch64.sh
index 2627cc83..e27a1e92 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 $*