From 54d0ff131097a2cd9a91a0c1dd84deb8b1f7d0ac Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 15 Jun 2012 05:21:43 +0200
Subject: Fix Bug 583: Remove Android compile-time dependencies and exclude
 Android specific classes for non Android platforms.

Adapt to GlueGen commits: b3c9951006f9bd863244f1db3d54ac7866d66f0a, 86c1df6fdca183454ff544857f4236b646c4730d

Ensure same Java JAR content regardless of build target (fix).

Separate Android compilation results: jogl.all-android.jar and jogl.test-android.jar
avoiding generating different content w/ non android builds.

Adding ${android.abi} to APK target name (jogl.all-android.apk -> jogl.all-android-armeabi-v7a.apk)
if not generic.
---
 make/scripts/adb-install-all-armv7.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'make/scripts/adb-install-all-armv7.sh')

diff --git a/make/scripts/adb-install-all-armv7.sh b/make/scripts/adb-install-all-armv7.sh
index 503c6f2f7..fe9765541 100755
--- a/make/scripts/adb-install-all-armv7.sh
+++ b/make/scripts/adb-install-all-armv7.sh
@@ -1,4 +1,4 @@
-adb $* install ../../gluegen/build-android-armv7/jogamp.android-launcher.apk
-adb $* install ../../gluegen/build-android-armv7/gluegen-rt.apk
-adb $* install ../build-android-armv7/jar/jogl.all-android.apk
-adb $* install ../build-android-armv7/jar/jogl.test.apk
+#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
-- 
cgit v1.2.3


From e51542375c4f736c396fd5a38288dd5129a09268 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 26 Jun 2012 12:36:58 +0200
Subject: Complete Bug #598 - Commit a393e45613d87101dbb13763df263c2f9291d2d0

---
 make/build-common.xml                 | 2 +-
 make/scripts/adb-install-all-armv7.sh | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'make/scripts/adb-install-all-armv7.sh')

diff --git a/make/build-common.xml b/make/build-common.xml
index b2885c8af..8d440a766 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -470,7 +470,7 @@
             <path refid="nativewindow_all_atoms.classpath" />
             <path refid="jogl_all_atoms.classpath" />
             <path refid="newt_all_atoms.classpath" />
-            <pathelement location="${newt.driver.android.jar}" />
+            <pathelement location="${newt-driver-android.jar}" />
         </path>
 
         <!-- Postbuild: javadoc .. -->
diff --git a/make/scripts/adb-install-all-armv7.sh b/make/scripts/adb-install-all-armv7.sh
index fe9765541..f0a1dc522 100755
--- a/make/scripts/adb-install-all-armv7.sh
+++ b/make/scripts/adb-install-all-armv7.sh
@@ -1,4 +1,4 @@
-#adb $* install ../../gluegen/build-android-armv7/jogamp.android-launcher.apk
+#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
+adb $* install ../build-android-armv7/jar/jogl-all-android-armeabi-v7a.apk
+adb $* install ../build-android-armv7/jar/jogl-test-android.apk
-- 
cgit v1.2.3