Jogamp
Adapt APK install scripts for harmonized os.and.arch names, see GlueGen commit 3b43a2...
authorSven Gothel <sgothel@jausoft.com>
Mon, 2 Feb 2015 23:26:33 +0000 (00:26 +0100)
committerSven Gothel <sgothel@jausoft.com>
Mon, 2 Feb 2015 23:26:33 +0000 (00:26 +0100)
make/build.xml
make/scripts/adb-install-all-aarch64.sh [moved from make/scripts/adb-install-all-arm64-v8a.sh with 69% similarity]
make/scripts/adb-install-all-armv6.sh
make/scripts/adb-reinstall-all-aarch64.sh [moved from make/scripts/adb-reinstall-all-arm64-v8a.sh with 56% similarity]

index 0136199..9954c16 100644 (file)
         <!-- 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}" />
           <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>
 
similarity index 69%
rename from make/scripts/adb-install-all-arm64-v8a.sh
rename to make/scripts/adb-install-all-aarch64.sh
index 6e34b00..edeff37 100755 (executable)
@@ -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
index 3abd89c..1666110 100755 (executable)
@@ -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
similarity index 56%
rename from make/scripts/adb-reinstall-all-arm64-v8a.sh
rename to make/scripts/adb-reinstall-all-aarch64.sh
index 2627cc8..e27a1e9 100755 (executable)
@@ -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 $*
 
http://JogAmp.org git info: FAQ, tutorial and man pages.