From e959f955901492f7d61abaa05da10c993052652b Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 2 Aug 2011 12:05:45 +0200
Subject: Android: Drop android.jar ; Simplify 'aapt.signed' ; Move our android
 resources -> make/resources

Drop android.jar
- version 8 and 9
- license: apache v2 (NOTICE.txt included)
- allows compilation using Android API on all platforms

Simplify 'aapt.signed'
- removed 'jarclasspathrefid', seems to be not needed
  (commented out)

Move our android resources make/lib/android -> make/resources/android
- make/lib is for 3rd party stuff only
---
 make/gluegen-properties.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'make/gluegen-properties.xml')

diff --git a/make/gluegen-properties.xml b/make/gluegen-properties.xml
index 95f58f5..5ccc119 100755
--- a/make/gluegen-properties.xml
+++ b/make/gluegen-properties.xml
@@ -43,7 +43,11 @@
     <property name="junit.jar" value="${gluegen.root}/make/lib/junit.jar" />
     <property name="ant.jar"       value="${ant.home}/lib/ant.jar" />
     <property name="ant-junit.jar" value="${ant.home}/lib/ant-junit.jar" />
+
+    <property name="android.version" value="9" /> <!-- default - if not set by jogamp-env.xml:jogamp.env.init -->
+    <property name="android.jar" value="${gluegen.root}/make/lib/android-sdk/${android.version}/android.jar" />
     <property name="ant-junit-all.apk" value="${gluegen.root}/make/lib/ant-junit-all.apk" />
+
     <condition property="win32.c.compiler" value="mingw64">
       <and>
         <os family="windows" />
-- 
cgit v1.2.3