changeset 4177:d63f879fbfc3

Android: minor fix after library function has been made closure stored in property.
author tb115823 <Tomas.Brandalik@oracle.com>
date Thu, 04 Jul 2013 10:12:33 +0200
parents 3c6268833424
children e48b05c36e15
files buildSrc/android.gradle
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/buildSrc/android.gradle	Thu Jul 04 10:12:31 2013 +0200
+++ b/buildSrc/android.gradle	Thu Jul 04 10:12:33 2013 +0200
@@ -60,6 +60,7 @@
 ANDROID.armArch = "${ARM_ARCH}"
 ANDROID.libDest = "lib/${ANDROID.armArch}"
 ANDROID.jfxdvklib = "jfxdvk.jar"
+ANDROID.library = { name -> return "lib${name}.so" as String }
 
 // Look for the the Android SDK & NDK to use, as well as the compiler stuff
 def sdk = project.hasProperty("ANDROID_SDK") ? getLatestPlatform("$ANDROID_SDK") : null;
@@ -122,8 +123,8 @@
                 def props = project.ext["ANDROID"]
                 copy {
                     from(
-                         "modules/graphics/build/libs/vmlauncher/android/${library(props.vmlauncher.lib)}",
-                         "modules/graphics/build/libs/surface/android/${library(props.surface.lib)}"                         
+                         "modules/graphics/build/libs/vmlauncher/android/${props.library(props.vmlauncher.lib)}",
+                         "modules/graphics/build/libs/surface/android/${props.library(props.surface.lib)}"
                     )                    
                     into ("build/android-sdk/dalvik/${props.libDest}")
                 }
@@ -183,12 +184,12 @@
                 def props = project.ext["ANDROID"]
                 copy {
                     from(
-                         "modules/web/build/libs/dvkwebview/android/${library(props.dvkwebview.lib)}"
+                         "modules/web/build/libs/dvkwebview/android/${props.library(props.dvkwebview.lib)}"
                     )                    
                     into ("build/android-sdk/dalvik/${props.libDest}")
                 }
                 copy {
-                    from ("modules/web/build/libs/webview/android/${library(props.webview.lib)}")
+                    from ("modules/web/build/libs/webview/android/${props.library(props.webview.lib)}")
                     into ("build/android-sdk/rt/${props.libDest}")
                 }
             }
@@ -234,7 +235,6 @@
 android.com.sun.javafx.isEmbedded=true
 """
 def sysroot = "${ANDROID_NDK}/platforms/${ANDROID_NDK_TARGET}/arch-arm"
-ANDROID.library = { name -> return "lib${name}.so" as String }
 
 def ccFlags = ["--sysroot=$sysroot","-std=c99", "-DANDROID", "-c", "-nostdlib", "-DANDROID_NDK"]
 def ccOptFlags = ["-fpic", "-ffunction-sections", "-funwind-tables","-fstack-protector",