diff options
| author | Sven Gothel <[email protected]> | 2011-08-02 12:05:45 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-08-02 12:05:45 +0200 |
| commit | e959f955901492f7d61abaa05da10c993052652b (patch) | |
| tree | 1df10becd7e24fbed6d90bea08aaf11cd783a843 /make/build.xml | |
| parent | e813dbe55f2a56457f28d1efd82762ce412b1f86 (diff) | |
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
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/make/build.xml b/make/build.xml index 1fa52c4..8e3cc92 100644 --- a/make/build.xml +++ b/make/build.xml @@ -108,10 +108,6 @@ <mkdir dir="${src.generated.c}/Windows" /> <mkdir dir="${classes}" /> - <condition property="android.jar" value="${env.ANDROID_SDK_HOME}/platforms/android-${env.ANDROID_SDK_VERSION}/android.jar"> - <isset property="isAndroid"/> - </condition> - <!-- Create the classpath for ANTLR. This requires the user-defined "antlr.jar" property. --> <path id="antlr.classpath"> @@ -708,7 +704,7 @@ jarbasename="gluegen-rt" nativebuilddir="${gluegen.lib.dir}" nativebasename="gluegen-rt" - androidmanifest.path="lib/android/AndroidManifest-Runtime.xml" + androidmanifest.path="resources/android/AndroidManifest-Runtime.xml" jarmanifest.path="${build}/Manifest-rt.temp" version.code="${gluegen_int_version}" version.name="${gluegen.version.plus}" /> @@ -718,7 +714,7 @@ jarbasename="gluegen" nativebuilddir="${gluegen.lib.dir}" nativebasename="gluegen-rt" - androidmanifest.path="lib/android/AndroidManifest-CompileTime.xml" + androidmanifest.path="resources/android/AndroidManifest-CompileTime.xml" jarmanifest.path="${build}/Manifest.temp" version.code="${gluegen_int_version}" version.name="${gluegen.version.plus}" /> |