X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=android%2Fproject%2Fxscreensaver%2Fbuild.gradle;h=0700c946e45c6943bce3c6e0bce710cdb5386038;hp=13373ec5fc44b7efc3f7310f21afa2fc4f5ca5c6;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hpb=88cfe534a698a0562e81345957a50714af1453bc

diff --git a/android/project/xscreensaver/build.gradle b/android/project/xscreensaver/build.gradle
index 13373ec5..0700c946 100644
--- a/android/project/xscreensaver/build.gradle
+++ b/android/project/xscreensaver/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'android'
 
 dependencies {
     compile fileTree(include: '*.jar', dir: 'libs')
-    compile project(':GLWallpaperService')
 }
 
 android {
@@ -52,33 +51,54 @@ android {
 
     // generate files early in the process
     task perlBuild(type: Exec) {
-        commandLine 'perl', '-x../..', '../../generate_files.pl', 'sproingies', 'superquadrics', 'stonerview', 'unknownpleasures', 'bouncingcow', 'hypertorus', 'glhanoi'
+        commandLine 'sh', '-c',
+          'cd ../..; ../hacks/check-configs.pl --build-android $ANDROID_HACKS'
     }
-
   
-    task perlClean(type: Exec) {
-        commandLine 'rm', '-f', '../../gen/glue.c', './res/values/items.xml', './res/values/strings.xml', './res/values/settings.xml'
+    task perlClean(type: Delete) {
+        delete('../../gen')
+        delete('res/values')
+        delete('res/xml')
+        delete('src/org/jwz/xscreensaver/gen')
+        delete('AndroidManifest.xml')
     }
 
-    task perlCleaner(type: Exec) {
-        commandLine 'rm', '-rf', './res/xml', './src/org/jwz/xscreensaver/gen'
+    task objlibClean(type: Delete) {
+        delete('./build')
+        delete('./libs')
+        delete('./obj')
     }
 
-    task objlibClean(type: Exec) {
-        commandLine 'rm', '-rf', './obj/local', './libs/armeabi', './libs/armeabi-v7a', './libs/mips', './libs/x86'
+    task downloadNeededDrawables(type: Exec) {
+        commandLine 'sh', '-c',
+          'cd ../../ ; \
+           for f in $ANDROID_HACKS; do \
+	     f=`echo "$f" | sed s/rd-bomb/rdbomb/` ; \
+             make -s project/xscreensaver/res/drawable/$f.png ; \
+           done'
     }
+    preBuild.dependsOn downloadNeededDrawables
+
+    preBuild.dependsOn perlBuild
 
- 
-    // if perlBuild already generated file, do not run perlBuild again
-    if (! file("../../gen/glue.c").exists()) {
-        preBuild.dependsOn perlBuild
+    task config_h(type: Exec) {
+        commandLine 'sh', '-c',
+          'if [ ! -s ../../../config.h ]; then \
+             echo "" >&2 ; echo "" >&2 ; \
+             echo "config.h does not exist.  cd .. and run ./configure" >&2 ; \
+             echo "" >&2 ; \
+             exit 1 ; \
+           fi'
     }
+    preBuild.dependsOn config_h
 
     clean.dependsOn perlClean
-    clean.dependsOn perlCleaner
     clean.dependsOn objlibClean
 
-    // 
+    tasks.withType(JavaCompile) {
+        options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
+    }
+
     tasks.withType(JavaCompile) {
         compileTask -> compileTask.dependsOn ndkBuild
     }