--- old/./build.gradle	2014-06-20 13:06:05.337414868 -0400
+++ new/./build.gradle	2014-06-20 13:06:05.065413519 -0400
@@ -631,6 +631,7 @@
     if (!targetProperties.containsKey('includeSwing')) targetProperties.includeSwing = true
     if (!targetProperties.containsKey('includeNull3d')) targetProperties.includeNull3d = true
     if (!targetProperties.containsKey('includeLens')) targetProperties.includeLens = false
+    if (!targetProperties.containsKey('includeMonocle')) targetProperties.includeMonocle = false
     if (!targetProperties.containsKey('includeEGL')) targetProperties.includeEGL = false
 
     if (!targetProperties.containsKey('includeGTK')) targetProperties.includeGTK = IS_LINUX
@@ -2740,6 +2741,9 @@
         if (!targetProperties.includeLens) {
             exclude ("com/sun/glass/ui/lens")
         }
+        if (!targetProperties.includeMonocle) {
+            exclude ("com/sun/glass/ui/monocle")
+        }
         if (!targetProperties.includeNull3d) {
             // "com/sun/prism/null3d", // TODO This is used in dev builds but not the final sdk
             exclude ("com/sun/prism/null3d")
@@ -2888,11 +2892,12 @@
             final File javafxProperties = file("build/${sdkDirName}/rt/lib/javafx.properties")
             javafxProperties.delete()
             javafxProperties << "javafx.runtime.version=$RAW_VERSION";
+            javafxProperties << "\n"
             // Include any properties that have been defined (most likely in
             // one of the various platform gradle files)
             if (targetProperties.containsKey("javafxProperties")) {
-                javafxProperties << "\n"
                 javafxProperties << targetProperties.javafxProperties
+                javafxProperties << "\n"
             }
 
             // Embedded builds define this file as well
@@ -2900,6 +2905,7 @@
                 final File javafxPlatformProperties = file("build/${sdkDirName}/rt/lib/javafx.platform.properties")
                 javafxPlatformProperties.delete()
                 javafxPlatformProperties << targetProperties.javafxPlatformProperties
+                javafxPlatformProperties << "\n"
             }
 
             // Copy over the javadocs that were generated. This is done rather than just generating
--- old/buildSrc/armv5sf.gradle	2014-06-20 13:06:06.453420393 -0400
+++ new/buildSrc/armv5sf.gradle	2014-06-20 13:06:06.201419152 -0400
@@ -51,6 +51,9 @@
     fail( "armv5sf Cannot build on this platform")
 }
 
+def compiler = file("$compilerHome/bin/${compilerPrefix}gcc").getAbsolutePath()
+def linker = file("$compilerHome/bin/${compilerPrefix}g++").getAbsolutePath()
+
 // Declare whether this particular target file applies to the current system
 ARMV5SF.canBuild = (IS_LINUX || IS_MAC) && compilerHome.exists() && sdk.exists()
 if (!ARMV5SF.canBuild) {
@@ -70,11 +73,13 @@
 ARMV5SF.compileMediaNative = false;
 
 ARMV5SF.includeLens = true
+ARMV5SF.includeMonocle = true
 ARMV5SF.includeNull3d = true
 ARMV5SF.includeEGL = true
 ARMV5SF.includeSwing = false
 ARMV5SF.includeSWT = false
 
+ARMV5SF.javafxPlatformDefault="monocle"
 
 // Libraries end up in the sdk/rt/lib/arm directory for arm builds
 ARMV5SF.arch = "arm"
@@ -184,7 +189,25 @@
     }
 )
 
-ARMV5SF.javafxPlatformProperties = """javafx.platform=monocle
+def monoclePlatformAdditions = """
+monocle.glass.platform=Monocle
+monocle.prism.order=es2,sw
+monocle.prism.eglfb=true
+monocle.prism.lcdtext=false
+monocle.prism.maxvram=128m
+monocle.prism.targetvram=112m
+monocle.use.egl=true
+monocle.use.gles2=true
+monocle.embedded=monocle
+monocle.com.sun.javafx.isEmbedded=true
+monocle.doNativeComposite=true
+monocle.com.sun.javafx.scene.control.skin.FXVK.cache=true
+monocle.prism.glDepthSize=0
+monocle.com.sun.javafx.gestures.zoom=true
+monocle.com.sun.javafx.gestures.rotate=true
+monocle.com.sun.javafx.gestures.scroll=true"""
+
+def lensPlatformAdditions = """
 directfb.com.sun.javafx.scene.control.skin.ListViewSkin.pannable=true
 directfb.com.sun.javafx.scene.control.skin.TreeViewSkin.pannable=true
 directfb.com.sun.javafx.scene.control.skin.TableViewSkin.pannable=true
@@ -208,10 +231,10 @@
 eglfb.prism.maxvram=128m
 eglfb.prism.targetvram=112m
 eglfb.use.egl=true
-eglfb.doNativeComposite=true
 eglfb.use.gles2=true
 eglfb.embedded=eglfb
 eglfb.com.sun.javafx.isEmbedded=true
+eglfb.doNativeComposite=true
 eglfb.com.sun.javafx.scene.control.skin.FXVK.cache=true
 eglfb.prism.glDepthSize=0
 eglfb.com.sun.javafx.gestures.zoom=true
@@ -229,22 +252,6 @@
 fb.com.sun.javafx.gestures.zoom=true
 fb.com.sun.javafx.gestures.rotate=true
 fb.com.sun.javafx.gestures.scroll=true
-monocle.glass.platform=Monocle
-monocle.prism.order=es2,sw
-monocle.prism.eglfb=true
-monocle.prism.lcdtext=false
-monocle.prism.maxvram=128m
-monocle.prism.targetvram=112m
-monocle.use.egl=true
-monocle.use.gles2=true
-monocle.embedded=monocle
-monocle.com.sun.javafx.isEmbedded=true
-monocle.doNativeComposite=true
-monocle.com.sun.javafx.scene.control.skin.FXVK.cache=true
-monocle.prism.glDepthSize=0
-monocle.com.sun.javafx.gestures.zoom=true
-monocle.com.sun.javafx.gestures.rotate=true
-monocle.com.sun.javafx.gestures.scroll=true
 eglx11.com.sun.javafx.scene.control.skin.ListViewSkin.pannable=true
 eglx11.com.sun.javafx.scene.control.skin.TreeViewSkin.pannable=true
 eglx11.com.sun.javafx.scene.control.skin.TableViewSkin.pannable=true
@@ -263,7 +270,9 @@
 eglx11.prism.glDepthSize=0
 eglx11.com.sun.javafx.gestures.zoom=true
 eglx11.com.sun.javafx.gestures.rotate=true
-eglx11.com.sun.javafx.gestures.scroll=true
+eglx11.com.sun.javafx.gestures.scroll=true"""
+
+def gtkPlatformAdditions = """
 gtk.com.sun.javafx.scene.control.skin.ListViewSkin.pannable=true
 gtk.com.sun.javafx.scene.control.skin.TreeViewSkin.pannable=true
 gtk.com.sun.javafx.scene.control.skin.TableViewSkin.pannable=true
@@ -324,20 +333,36 @@
     }
 )
 
-def compiler = file("$compilerHome/bin/${compilerPrefix}gcc").getAbsolutePath()
-def linker = file("$compilerHome/bin/${compilerPrefix}g++").getAbsolutePath()
+ARMV5SF.javafxPlatformProperties = "javafx.platform=${ARMV5SF.javafxPlatformDefault}"
 
 ARMV5SF.glass = [:]
-ARMV5SF.glass.variants = ["eglfb", "directfb", "fb", "gtk", "lensport", "monocle", "monocle_x11" ]
 ARMV5SF.glass.javahInclude = [
     "com/sun/glass/events/**",
-    "com/sun/glass/ui/*",
-    "com/sun/glass/ui/lens/*",
-    "com/sun/glass/ui/monocle/*",
-    "com/sun/glass/ui/monocle/linux/*",
-    "com/sun/glass/ui/monocle/util/*",
-    "com/sun/glass/ui/monocle/x11/*",
-    "com/sun/glass/ui/gtk/*"]
+    "com/sun/glass/ui/*"]
+ARMV5SF.glass.variants = [ ]
+if (ARMV5SF.includeLens) { 
+    ARMV5SF.glass.variants.addAll("eglfb", "directfb", "fb", "lensport" );
+    ARMV5SF.glass.javahInclude.addAll("com/sun/glass/ui/lens/*");
+    ARMV5SF.javafxPlatformProperties = ARMV5SF.javafxPlatformProperties + lensPlatformAdditions
+
+}
+if (ARMV5SF.includeMonocle) { 
+    ARMV5SF.glass.variants.addAll("monocle", "monocle_x11");
+    ARMV5SF.glass.javahInclude.addAll(
+        "com/sun/glass/ui/monocle/*",
+        "com/sun/glass/ui/monocle/dispman/*",
+        "com/sun/glass/ui/monocle/mx6/*",
+        "com/sun/glass/ui/monocle/linux/*",
+        "com/sun/glass/ui/monocle/util/*",
+        "com/sun/glass/ui/monocle/x11/*");
+    ARMV5SF.javafxPlatformProperties = ARMV5SF.javafxPlatformProperties + monoclePlatformAdditions
+}
+if (ARMV5SF.includeGTK) {
+    ARMV5SF.glass.variants.addAll("gtk");
+    ARMV5SF.glass.javahInclude.addAll("com/sun/glass/ui/gtk/*");
+    ARMV5SF.javafxPlatformProperties = ARMV5SF.javafxPlatformProperties + gtkPlatformAdditions
+}
+
 ARMV5SF.glass.lib = "glass"
 
 ARMV5SF.glass.lensport = [:]
--- old/buildSrc/armv6hf.gradle	2014-06-20 13:06:07.509425629 -0400
+++ new/buildSrc/armv6hf.gradle	2014-06-20 13:06:07.253424359 -0400
@@ -61,6 +61,9 @@
     compilerPrefix="${rootProject.ARMV6HF_COMPILER_PREFIX}"
 }
 
+def compiler = file("$compilerHome/bin/${compilerPrefix}gcc").getAbsolutePath()
+def linker = file("$compilerHome/bin/${compilerPrefix}g++").getAbsolutePath()
+
 // Declare whether this particular target file applies to the current system
 ARMV6HF.canBuild = (IS_LINUX || IS_MAC) && compilerHome.exists() && sdk.exists()
 if (!ARMV6HF.canBuild) {
@@ -78,12 +81,15 @@
 ARMV6HF.compileDesignTime = false;
 
 ARMV6HF.includeLens = true
+ARMV6HF.includeMonocle = true
 ARMV6HF.includeNull3d = true
 ARMV6HF.includeEGL = true
 ARMV6HF.includeSwing = false
 ARMV6HF.includeSWT = false
 ARMV6HF.includeGTK = true
 
+ARMV6HF.javafxPlatformDefault="monocle"
+
 // Libraries end up in the sdk/rt/lib/arm directory for arm builds
 ARMV6HF.arch = "arm"
 ARMV6HF.libDest = "lib/arm"
@@ -185,7 +191,25 @@
     }
 )
 
-ARMV6HF.javafxPlatformProperties ="""javafx.platform=monocle
+def monoclePlatformAdditions = """
+monocle.glass.platform=Monocle
+monocle.prism.order=es2,sw
+monocle.prism.eglfb=true
+monocle.prism.lcdtext=false
+monocle.prism.maxvram=128m
+monocle.prism.targetvram=112m
+monocle.use.egl=true
+monocle.use.gles2=true
+monocle.embedded=monocle
+monocle.com.sun.javafx.isEmbedded=true
+monocle.doNativeComposite=true
+monocle.com.sun.javafx.scene.control.skin.FXVK.cache=true
+monocle.prism.glDepthSize=0
+monocle.com.sun.javafx.gestures.zoom=true
+monocle.com.sun.javafx.gestures.rotate=true
+monocle.com.sun.javafx.gestures.scroll=true"""
+
+def lensPlatformAdditions = """
 directfb.com.sun.javafx.scene.control.skin.ListViewSkin.pannable=true
 directfb.com.sun.javafx.scene.control.skin.TreeViewSkin.pannable=true
 directfb.com.sun.javafx.scene.control.skin.TableViewSkin.pannable=true
@@ -229,22 +253,6 @@
 fb.com.sun.javafx.gestures.zoom=true
 fb.com.sun.javafx.gestures.rotate=true
 fb.com.sun.javafx.gestures.scroll=true
-monocle.glass.platform=Monocle
-monocle.prism.order=es2,sw
-monocle.prism.eglfb=true
-monocle.prism.lcdtext=false
-monocle.prism.maxvram=128m
-monocle.prism.targetvram=112m
-monocle.use.egl=true
-monocle.use.gles2=true
-monocle.embedded=monocle
-monocle.com.sun.javafx.isEmbedded=true
-monocle.doNativeComposite=true
-monocle.com.sun.javafx.scene.control.skin.FXVK.cache=true
-monocle.prism.glDepthSize=0
-monocle.com.sun.javafx.gestures.zoom=true
-monocle.com.sun.javafx.gestures.rotate=true
-monocle.com.sun.javafx.gestures.scroll=true
 eglx11.com.sun.javafx.scene.control.skin.ListViewSkin.pannable=true
 eglx11.com.sun.javafx.scene.control.skin.TreeViewSkin.pannable=true
 eglx11.com.sun.javafx.scene.control.skin.TableViewSkin.pannable=true
@@ -263,7 +271,9 @@
 eglx11.prism.glDepthSize=0
 eglx11.com.sun.javafx.gestures.zoom=true
 eglx11.com.sun.javafx.gestures.rotate=true
-eglx11.com.sun.javafx.gestures.scroll=true
+eglx11.com.sun.javafx.gestures.scroll=true"""
+
+def gtkPlatformAdditions = """
 gtk.com.sun.javafx.scene.control.skin.ListViewSkin.pannable=true
 gtk.com.sun.javafx.scene.control.skin.TreeViewSkin.pannable=true
 gtk.com.sun.javafx.scene.control.skin.TableViewSkin.pannable=true
@@ -324,22 +334,35 @@
     }
 )
 
-def compiler = file("$compilerHome/bin/${compilerPrefix}gcc").getAbsolutePath()
-def linker = file("$compilerHome/bin/${compilerPrefix}g++").getAbsolutePath()
+ARMV6HF.javafxPlatformProperties = "javafx.platform=${ARMV6HF.javafxPlatformDefault}"
 
 ARMV6HF.glass = [:]
-ARMV6HF.glass.variants = ["eglfb", "directfb", "fb", "gtk", "lensport", "monocle", "monocle_x11" ]
 ARMV6HF.glass.javahInclude = [
     "com/sun/glass/events/**",
-    "com/sun/glass/ui/*",
-    "com/sun/glass/ui/lens/*",
-    "com/sun/glass/ui/monocle/*",
-    "com/sun/glass/ui/monocle/dispman/*",
-    "com/sun/glass/ui/monocle/mx6/*",
-    "com/sun/glass/ui/monocle/linux/*",
-    "com/sun/glass/ui/monocle/util/*",
-    "com/sun/glass/ui/monocle/x11/*",
-    "com/sun/glass/ui/gtk/*"]
+    "com/sun/glass/ui/*"]
+ARMV6HF.glass.variants = [ ]
+if (ARMV6HF.includeLens) { 
+    ARMV6HF.glass.variants.addAll("eglfb", "directfb", "fb", "lensport" );
+    ARMV6HF.glass.javahInclude.addAll("com/sun/glass/ui/lens/*");
+    ARMV6HF.javafxPlatformProperties = ARMV6HF.javafxPlatformProperties + lensPlatformAdditions
+}
+if (ARMV6HF.includeMonocle) { 
+    ARMV6HF.glass.variants.addAll("monocle", "monocle_x11");
+    ARMV6HF.glass.javahInclude.addAll(
+        "com/sun/glass/ui/monocle/*",
+        "com/sun/glass/ui/monocle/dispman/*",
+        "com/sun/glass/ui/monocle/mx6/*",
+        "com/sun/glass/ui/monocle/linux/*",
+        "com/sun/glass/ui/monocle/util/*",
+        "com/sun/glass/ui/monocle/x11/*");
+    ARMV6HF.javafxPlatformProperties = ARMV6HF.javafxPlatformProperties + monoclePlatformAdditions
+}
+if (ARMV6HF.includeGTK) {
+    ARMV6HF.glass.variants.addAll("gtk");
+    ARMV6HF.glass.javahInclude.addAll("com/sun/glass/ui/gtk/*");
+    ARMV6HF.javafxPlatformProperties = ARMV6HF.javafxPlatformProperties + gtkPlatformAdditions
+}
+
 ARMV6HF.glass.lib = "glass"
 
 ARMV6HF.glass.lensport = [:]
--- old/buildSrc/armv6sf.gradle	2014-06-20 13:06:08.573430910 -0400
+++ new/buildSrc/armv6sf.gradle	2014-06-20 13:06:08.309429597 -0400
@@ -52,6 +52,9 @@
     return;
 }
 
+def compiler = file("$compilerHome/bin/${compilerPrefix}gcc").getAbsolutePath()
+def linker = file("$compilerHome/bin/${compilerPrefix}g++").getAbsolutePath()
+
 // Declare whether this particular target file applies to the current system
 ARMV6SF.canBuild = (IS_LINUX || IS_MAC) && compilerHome.exists() && sdk.exists()
 if (!ARMV6SF.canBuild) {
@@ -69,12 +72,15 @@
 ARMV6SF.compileDesignTime = false;
 
 ARMV6SF.includeLens = true
+ARMV6SF.includeMonocle = true
 ARMV6SF.includeNull3d = true
 ARMV6SF.includeEGL = true
 ARMV6SF.includeSwing = false
 ARMV6SF.includeSWT = false
 ARMV6SF.includeGTK = true
 
+ARMV6SF.javafxPlatformDefault="monocle"
+
 // Libraries end up in the sdk/rt/lib/arm directory for arm builds
 ARMV6SF.arch = "arm"
 ARMV6SF.libDest = "lib/arm"
@@ -183,7 +189,25 @@
     }
 )
 
-ARMV6SF.javafxPlatformProperties = """javafx.platform=monocle
+def monoclePlatformAdditions = """
+monocle.glass.platform=Monocle
+monocle.prism.order=es2,sw
+monocle.prism.eglfb=true
+monocle.prism.lcdtext=false
+monocle.prism.maxvram=128m
+monocle.prism.targetvram=112m
+monocle.use.egl=true
+monocle.use.gles2=true
+monocle.embedded=monocle
+monocle.com.sun.javafx.isEmbedded=true
+monocle.doNativeComposite=true
+monocle.com.sun.javafx.scene.control.skin.FXVK.cache=true
+monocle.prism.glDepthSize=0
+monocle.com.sun.javafx.gestures.zoom=true
+monocle.com.sun.javafx.gestures.rotate=true
+monocle.com.sun.javafx.gestures.scroll=true"""
+
+def lensPlatformAdditions = """
 directfb.com.sun.javafx.scene.control.skin.ListViewSkin.pannable=true
 directfb.com.sun.javafx.scene.control.skin.TreeViewSkin.pannable=true
 directfb.com.sun.javafx.scene.control.skin.TableViewSkin.pannable=true
@@ -207,10 +231,10 @@
 eglfb.prism.maxvram=128m
 eglfb.prism.targetvram=112m
 eglfb.use.egl=true
-eglfb.doNativeComposite=true
 eglfb.use.gles2=true
 eglfb.embedded=eglfb
 eglfb.com.sun.javafx.isEmbedded=true
+eglfb.doNativeComposite=true
 eglfb.com.sun.javafx.scene.control.skin.FXVK.cache=true
 eglfb.prism.glDepthSize=0
 eglfb.com.sun.javafx.gestures.zoom=true
@@ -228,22 +252,6 @@
 fb.com.sun.javafx.gestures.zoom=true
 fb.com.sun.javafx.gestures.rotate=true
 fb.com.sun.javafx.gestures.scroll=true
-monocle.glass.platform=Monocle
-monocle.prism.order=es2,sw
-monocle.prism.eglfb=true
-monocle.prism.lcdtext=false
-monocle.prism.maxvram=128m
-monocle.prism.targetvram=112m
-monocle.use.egl=true
-monocle.use.gles2=true
-monocle.embedded=monocle
-monocle.com.sun.javafx.isEmbedded=true
-monocle.doNativeComposite=true
-monocle.com.sun.javafx.scene.control.skin.FXVK.cache=true
-monocle.prism.glDepthSize=0
-monocle.com.sun.javafx.gestures.zoom=true
-monocle.com.sun.javafx.gestures.rotate=true
-monocle.com.sun.javafx.gestures.scroll=true
 eglx11.com.sun.javafx.scene.control.skin.ListViewSkin.pannable=true
 eglx11.com.sun.javafx.scene.control.skin.TreeViewSkin.pannable=true
 eglx11.com.sun.javafx.scene.control.skin.TableViewSkin.pannable=true
@@ -262,7 +270,9 @@
 eglx11.prism.glDepthSize=0
 eglx11.com.sun.javafx.gestures.zoom=true
 eglx11.com.sun.javafx.gestures.rotate=true
-eglx11.com.sun.javafx.gestures.scroll=true
+eglx11.com.sun.javafx.gestures.scroll=true"""
+
+def gtkPlatformAdditions = """
 gtk.com.sun.javafx.scene.control.skin.ListViewSkin.pannable=true
 gtk.com.sun.javafx.scene.control.skin.TreeViewSkin.pannable=true
 gtk.com.sun.javafx.scene.control.skin.TableViewSkin.pannable=true
@@ -323,20 +333,35 @@
     }
 )
 
-def compiler = file("$compilerHome/bin/${compilerPrefix}gcc").getAbsolutePath()
-def linker = file("$compilerHome/bin/${compilerPrefix}g++").getAbsolutePath()
+ARMV6SF.javafxPlatformProperties = "javafx.platform=${ARMV6SF.javafxPlatformDefault}"
 
 ARMV6SF.glass = [:]
-ARMV6SF.glass.variants = ["eglfb", "directfb", "fb", "gtk", "lensport", "monocle", "monocle_x11" ]
 ARMV6SF.glass.javahInclude = [
     "com/sun/glass/events/**",
-    "com/sun/glass/ui/*",
-    "com/sun/glass/ui/lens/*",
-    "com/sun/glass/ui/monocle/*",
-    "com/sun/glass/ui/monocle/linux/*",
-    "com/sun/glass/ui/monocle/util/*",
-    "com/sun/glass/ui/monocle/x11/*",
-    "com/sun/glass/ui/gtk/*"]
+    "com/sun/glass/ui/*"]
+ARMV6SF.glass.variants = [ ]
+if (ARMV6SF.includeLens) { 
+    ARMV6SF.glass.variants.addAll("eglfb", "directfb", "fb", "lensport" );
+    ARMV6SF.glass.javahInclude.addAll("com/sun/glass/ui/lens/*");
+    ARMV6SF.javafxPlatformProperties = ARMV6SF.javafxPlatformProperties + lensPlatformAdditions
+}
+if (ARMV6SF.includeMonocle) { 
+    ARMV6SF.glass.variants.addAll("monocle", "monocle_x11");
+    ARMV6SF.glass.javahInclude.addAll(
+        "com/sun/glass/ui/monocle/*",
+        "com/sun/glass/ui/monocle/dispman/*",
+        "com/sun/glass/ui/monocle/mx6/*",
+        "com/sun/glass/ui/monocle/linux/*",
+        "com/sun/glass/ui/monocle/util/*",
+        "com/sun/glass/ui/monocle/x11/*");
+    ARMV6SF.javafxPlatformProperties = ARMV6SF.javafxPlatformProperties + monoclePlatformAdditions
+}
+if (ARMV6SF.includeGTK) {
+    ARMV6SF.glass.variants.addAll("gtk");
+    ARMV6SF.glass.javahInclude.addAll("com/sun/glass/ui/gtk/*");
+    ARMV6SF.javafxPlatformProperties = ARMV6SF.javafxPlatformProperties + gtkPlatformAdditions
+}
+
 ARMV6SF.glass.lib = "glass"
 
 ARMV6SF.glass.lensport = [:]
--- old/buildSrc/armv7hf.gradle	2014-06-20 13:06:09.625436132 -0400
+++ new/buildSrc/armv7hf.gradle	2014-06-20 13:06:09.369434862 -0400
@@ -61,6 +61,9 @@
     compilerPrefix="${rootProject.ARMV7HF_COMPILER_PREFIX}"
 }
 
+def compiler = file("$compilerHome/bin/${compilerPrefix}gcc").getAbsolutePath()
+def linker = file("$compilerHome/bin/${compilerPrefix}g++").getAbsolutePath()
+
 // Declare whether this particular target file applies to the current system
 ARMV7HF.canBuild = (IS_LINUX || IS_MAC) && compilerHome.exists() && sdk.exists()
 if (!ARMV7HF.canBuild) {
@@ -80,11 +83,14 @@
 ARMV7HF.compileMediaNative = false;
 
 ARMV7HF.includeLens = true
+ARMV7HF.includeMonocle = true
 ARMV7HF.includeNull3d = true
 ARMV7HF.includeEGL = true
 ARMV7HF.includeSwing = false
 ARMV7HF.includeSWT = false
 
+ARMV7HF.javafxPlatformDefault="monocle"
+
 // Libraries end up in the sdk/rt/lib/arm directory for arm builds
 ARMV7HF.arch = "arm"
 ARMV7HF.libDest = "lib/arm"
@@ -156,7 +162,7 @@
 
 def gtkCFlags = [extraCFlags].flatten()
 def gtkLFlags = [extraLFlags].flatten()
-setupTools("armv6hf_tools",
+setupTools("armv7hf_tools",
     { propFile ->
         ByteArrayOutputStream results = new ByteArrayOutputStream();
         exec {
@@ -178,7 +184,25 @@
     }
 )
 
-ARMV7HF.javafxPlatformProperties ="""javafx.platform=monocle
+def monoclePlatformAdditions = """
+monocle.glass.platform=Monocle
+monocle.prism.order=es2,sw
+monocle.prism.eglfb=true
+monocle.prism.lcdtext=false
+monocle.prism.maxvram=128m
+monocle.prism.targetvram=112m
+monocle.use.egl=true
+monocle.use.gles2=true
+monocle.embedded=monocle
+monocle.com.sun.javafx.isEmbedded=true
+monocle.doNativeComposite=true
+monocle.com.sun.javafx.scene.control.skin.FXVK.cache=true
+monocle.prism.glDepthSize=0
+monocle.com.sun.javafx.gestures.zoom=true
+monocle.com.sun.javafx.gestures.rotate=true
+monocle.com.sun.javafx.gestures.scroll=true"""
+
+def lensPlatformAdditions = """
 directfb.com.sun.javafx.scene.control.skin.ListViewSkin.pannable=true
 directfb.com.sun.javafx.scene.control.skin.TreeViewSkin.pannable=true
 directfb.com.sun.javafx.scene.control.skin.TableViewSkin.pannable=true
@@ -206,10 +230,10 @@
 eglfb.com.sun.javafx.isEmbedded=true
 eglfb.doNativeComposite=true
 eglfb.com.sun.javafx.scene.control.skin.FXVK.cache=true
+eglfb.prism.glDepthSize=0
 eglfb.com.sun.javafx.gestures.zoom=true
 eglfb.com.sun.javafx.gestures.rotate=true
 eglfb.com.sun.javafx.gestures.scroll=true
-eglfb.prism.glDepthSize=0
 fb.com.sun.javafx.scene.control.skin.ListViewSkin.pannable=true
 fb.com.sun.javafx.scene.control.skin.TreeViewSkin.pannable=true
 fb.com.sun.javafx.scene.control.skin.TableViewSkin.pannable=true
@@ -222,22 +246,6 @@
 fb.com.sun.javafx.gestures.zoom=true
 fb.com.sun.javafx.gestures.rotate=true
 fb.com.sun.javafx.gestures.scroll=true
-monocle.glass.platform=Monocle
-monocle.prism.order=es2,sw
-monocle.prism.eglfb=true
-monocle.prism.lcdtext=false
-monocle.prism.maxvram=128m
-monocle.prism.targetvram=112m
-monocle.use.egl=true
-monocle.use.gles2=true
-monocle.embedded=monocle
-monocle.com.sun.javafx.isEmbedded=true
-monocle.doNativeComposite=true
-monocle.com.sun.javafx.scene.control.skin.FXVK.cache=true
-monocle.com.sun.javafx.gestures.zoom=true
-monocle.com.sun.javafx.gestures.rotate=true
-monocle.com.sun.javafx.gestures.scroll=true
-monocle.prism.glDepthSize=0
 eglx11.com.sun.javafx.scene.control.skin.ListViewSkin.pannable=true
 eglx11.com.sun.javafx.scene.control.skin.TreeViewSkin.pannable=true
 eglx11.com.sun.javafx.scene.control.skin.TableViewSkin.pannable=true
@@ -253,10 +261,12 @@
 eglx11.embedded=eglx11
 eglx11.com.sun.javafx.isEmbedded=true
 eglx11.com.sun.javafx.scene.control.skin.FXVK.cache=true
+eglx11.prism.glDepthSize=0
 eglx11.com.sun.javafx.gestures.zoom=true
 eglx11.com.sun.javafx.gestures.rotate=true
-eglx11.com.sun.javafx.gestures.scroll=true
-eglx11.prism.glDepthSize=0
+eglx11.com.sun.javafx.gestures.scroll=true"""
+
+def gtkPlatformAdditions = """
 gtk.com.sun.javafx.scene.control.skin.ListViewSkin.pannable=true
 gtk.com.sun.javafx.scene.control.skin.TreeViewSkin.pannable=true
 gtk.com.sun.javafx.scene.control.skin.TableViewSkin.pannable=true
@@ -270,7 +280,7 @@
 
 def pangoCCFlags = [extraCFlags, "-D_ENABLE_PANGO"];
 def pangoLinkFlags = [extraLFlags];
-setupTools("armv6hf_pango_tools",
+setupTools("armv7hf_pango_tools",
     { propFile ->
         ByteArrayOutputStream results = new ByteArrayOutputStream();
         exec {
@@ -295,7 +305,7 @@
 def freetypeCCFlags = [ext.IS_COMPILE_PANGO ? "-D_ENABLE_PANGO" :
                        ext.IS_COMPILE_HARFBUZZ ? "-D_ENABLE_HARFBUZZ" : ""]
 def freetypeLinkFlags = []
-setupTools("armv6hf_freetype_tools",
+setupTools("armv7hf_freetype_tools",
     { propFile ->
         ByteArrayOutputStream results = new ByteArrayOutputStream();
         exec {
@@ -317,19 +327,35 @@
     }
 )
 
-def compiler = file("$compilerHome/bin/${compilerPrefix}gcc").getAbsolutePath()
-def linker = file("$compilerHome/bin/${compilerPrefix}g++").getAbsolutePath()
+ARMV7HF.javafxPlatformProperties = "javafx.platform=${ARMV7HF.javafxPlatformDefault}"
 
 ARMV7HF.glass = [:]
-ARMV7HF.glass.variants = ["eglfb", "directfb", "fb", "gtk", "lensport", "monocle", "monocle_x11" ]
 ARMV7HF.glass.javahInclude = [
     "com/sun/glass/events/**",
-    "com/sun/glass/ui/*",
-    "com/sun/glass/ui/lens/*",
-    "com/sun/glass/ui/monocle/linux/*",
-    "com/sun/glass/ui/monocle/util/*",
-    "com/sun/glass/ui/monocle/x11/*",
-    "com/sun/glass/ui/gtk/*"]
+    "com/sun/glass/ui/*"]
+ARMV7HF.glass.variants = [ ]
+if (ARMV7HF.includeLens) { 
+    ARMV7HF.glass.variants.addAll("eglfb", "directfb", "fb", "lensport" );
+    ARMV7HF.glass.javahInclude.addAll("com/sun/glass/ui/lens/*");
+    ARMV7HF.javafxPlatformProperties = ARMV7HF.javafxPlatformProperties + lensPlatformAdditions
+}
+if (ARMV7HF.includeMonocle) { 
+    ARMV7HF.glass.variants.addAll("monocle", "monocle_x11");
+    ARMV7HF.glass.javahInclude.addAll(
+        "com/sun/glass/ui/monocle/*",
+        "com/sun/glass/ui/monocle/dispman/*",
+        "com/sun/glass/ui/monocle/mx6/*",
+        "com/sun/glass/ui/monocle/linux/*",
+        "com/sun/glass/ui/monocle/util/*",
+        "com/sun/glass/ui/monocle/x11/*");
+    ARMV7HF.javafxPlatformProperties = ARMV7HF.javafxPlatformProperties + monoclePlatformAdditions
+}
+if (ARMV7HF.includeGTK) {
+    ARMV7HF.glass.variants.addAll("gtk");
+    ARMV7HF.glass.javahInclude.addAll("com/sun/glass/ui/gtk/*");
+    ARMV7HF.javafxPlatformProperties = ARMV7HF.javafxPlatformProperties + gtkPlatformAdditions
+}
+
 ARMV7HF.glass.lib = "glass"
 
 ARMV7HF.glass.lensport = [:]
--- old/buildSrc/armv7sf.gradle	2014-06-20 13:06:10.673441318 -0400
+++ new/buildSrc/armv7sf.gradle	2014-06-20 13:06:10.417440049 -0400
@@ -51,6 +51,9 @@
     fail "armv7sf Cannot build on this platform"
 }
 
+def compiler = file("$compilerHome/bin/${compilerPrefix}gcc").getAbsolutePath()
+def linker = file("$compilerHome/bin/${compilerPrefix}g++").getAbsolutePath()
+
 // Declare whether this particular target file applies to the current system
 ARMV7SF.canBuild = (IS_LINUX || IS_MAC) && compilerHome.exists() && sdk.exists()
 if (!ARMV7SF.canBuild) {
@@ -70,11 +73,14 @@
 ARMV7SF.compileMediaNative = false;
 
 ARMV7SF.includeLens = true
+ARMV7SF.includeMonocle = true
 ARMV7SF.includeNull3d = true
 ARMV7SF.includeEGL = true
 ARMV7SF.includeSwing = false
 ARMV7SF.includeSWT = false
 
+ARMV7SF.javafxPlatformDefault="monocle"
+
 // Libraries end up in the sdk/rt/lib/arm directory for arm builds
 ARMV7SF.arch = "arm"
 ARMV7SF.libDest = "lib/arm"
@@ -183,7 +189,25 @@
     }
 )
 
-ARMV7SF.javafxPlatformProperties = """javafx.platform=monocle
+def monoclePlatformAdditions = """
+monocle.glass.platform=Monocle
+monocle.prism.order=es2,sw
+monocle.prism.eglfb=true
+monocle.prism.lcdtext=false
+monocle.prism.maxvram=128m
+monocle.prism.targetvram=112m
+monocle.use.egl=true
+monocle.use.gles2=true
+monocle.embedded=monocle
+monocle.com.sun.javafx.isEmbedded=true
+monocle.doNativeComposite=true
+monocle.com.sun.javafx.scene.control.skin.FXVK.cache=true
+monocle.prism.glDepthSize=0
+monocle.com.sun.javafx.gestures.zoom=true
+monocle.com.sun.javafx.gestures.rotate=true
+monocle.com.sun.javafx.gestures.scroll=true"""
+
+def lensPlatformAdditions = """
 directfb.com.sun.javafx.scene.control.skin.ListViewSkin.pannable=true
 directfb.com.sun.javafx.scene.control.skin.TreeViewSkin.pannable=true
 directfb.com.sun.javafx.scene.control.skin.TableViewSkin.pannable=true
@@ -207,15 +231,15 @@
 eglfb.prism.maxvram=128m
 eglfb.prism.targetvram=112m
 eglfb.use.egl=true
-eglfb.doNativeComposite=true
 eglfb.use.gles2=true
 eglfb.embedded=eglfb
 eglfb.com.sun.javafx.isEmbedded=true
+eglfb.doNativeComposite=true
 eglfb.com.sun.javafx.scene.control.skin.FXVK.cache=true
+eglfb.prism.glDepthSize=0
 eglfb.com.sun.javafx.gestures.zoom=true
 eglfb.com.sun.javafx.gestures.rotate=true
 eglfb.com.sun.javafx.gestures.scroll=true
-eglfb.prism.glDepthSize=0
 fb.com.sun.javafx.scene.control.skin.ListViewSkin.pannable=true
 fb.com.sun.javafx.scene.control.skin.TreeViewSkin.pannable=true
 fb.com.sun.javafx.scene.control.skin.TableViewSkin.pannable=true
@@ -228,22 +252,6 @@
 fb.com.sun.javafx.gestures.zoom=true
 fb.com.sun.javafx.gestures.rotate=true
 fb.com.sun.javafx.gestures.scroll=true
-monocle.glass.platform=Monocle
-monocle.prism.order=es2,sw
-monocle.prism.eglfb=true
-monocle.prism.lcdtext=false
-monocle.prism.maxvram=128m
-monocle.prism.targetvram=112m
-monocle.use.egl=true
-monocle.use.gles2=true
-monocle.embedded=monocle
-monocle.com.sun.javafx.isEmbedded=true
-monocle.doNativeComposite=true
-monocle.com.sun.javafx.scene.control.skin.FXVK.cache=true
-monocle.com.sun.javafx.gestures.zoom=true
-monocle.com.sun.javafx.gestures.rotate=true
-monocle.com.sun.javafx.gestures.scroll=true
-monocle.prism.glDepthSize=0
 eglx11.com.sun.javafx.scene.control.skin.ListViewSkin.pannable=true
 eglx11.com.sun.javafx.scene.control.skin.TreeViewSkin.pannable=true
 eglx11.com.sun.javafx.scene.control.skin.TableViewSkin.pannable=true
@@ -259,10 +267,12 @@
 eglx11.embedded=eglx11
 eglx11.com.sun.javafx.isEmbedded=true
 eglx11.com.sun.javafx.scene.control.skin.FXVK.cache=true
+eglx11.prism.glDepthSize=0
 eglx11.com.sun.javafx.gestures.zoom=true
 eglx11.com.sun.javafx.gestures.rotate=true
-eglx11.com.sun.javafx.gestures.scroll=true
-eglx11.prism.glDepthSize=0
+eglx11.com.sun.javafx.gestures.scroll=true"""
+
+def gtkPlatformAdditions = """
 gtk.com.sun.javafx.scene.control.skin.ListViewSkin.pannable=true
 gtk.com.sun.javafx.scene.control.skin.TreeViewSkin.pannable=true
 gtk.com.sun.javafx.scene.control.skin.TableViewSkin.pannable=true
@@ -323,20 +333,35 @@
     }
 )
 
-def compiler = file("$compilerHome/bin/${compilerPrefix}gcc").getAbsolutePath()
-def linker = file("$compilerHome/bin/${compilerPrefix}g++").getAbsolutePath()
+ARMV7SF.javafxPlatformProperties = "javafx.platform=${ARMV7SF.javafxPlatformDefault}"
 
 ARMV7SF.glass = [:]
-ARMV7SF.glass.variants = ["eglfb", "directfb", "fb", "gtk", "lensport", "monocle", "monocle_x11" ]
 ARMV7SF.glass.javahInclude = [
     "com/sun/glass/events/**",
-    "com/sun/glass/ui/*",
-    "com/sun/glass/ui/lens/*",
-    "com/sun/glass/ui/monocle/*",
-    "com/sun/glass/ui/monocle/linux/*",
-    "com/sun/glass/ui/monocle/util/*",
-    "com/sun/glass/ui/monocle/x11/*",
-    "com/sun/glass/ui/gtk/*"]
+    "com/sun/glass/ui/*"]
+ARMV7SF.glass.variants = [ ]
+if (ARMV7SF.includeLens) { 
+    ARMV7SF.glass.variants.addAll("eglfb", "directfb", "fb", "lensport" );
+    ARMV7SF.glass.javahInclude.addAll("com/sun/glass/ui/lens/*");
+    ARMV7SF.javafxPlatformProperties = ARMV7SF.javafxPlatformProperties + lensPlatformAdditions
+}
+if (ARMV7SF.includeMonocle) { 
+    ARMV7SF.glass.variants.addAll("monocle", "monocle_x11");
+    ARMV7SF.glass.javahInclude.addAll(
+        "com/sun/glass/ui/monocle/*",
+        "com/sun/glass/ui/monocle/dispman/*",
+        "com/sun/glass/ui/monocle/mx6/*",
+        "com/sun/glass/ui/monocle/linux/*",
+        "com/sun/glass/ui/monocle/util/*",
+        "com/sun/glass/ui/monocle/x11/*");
+    ARMV7SF.javafxPlatformProperties = ARMV7SF.javafxPlatformProperties + monoclePlatformAdditions
+}
+if (ARMV7SF.includeGTK) {
+    ARMV7SF.glass.variants.addAll("gtk");
+    ARMV7SF.glass.javahInclude.addAll("com/sun/glass/ui/gtk/*");
+    ARMV7SF.javafxPlatformProperties = ARMV7SF.javafxPlatformProperties + gtkPlatformAdditions
+}
+
 ARMV7SF.glass.lib = "glass"
 
 ARMV7SF.glass.lensport = [:]
--- old/buildSrc/x86egl.gradle	2014-06-20 13:06:11.733446575 -0400
+++ new/buildSrc/x86egl.gradle	2014-06-20 13:06:11.473445285 -0400
@@ -55,6 +55,9 @@
     compilerPrefix=""
 }
 
+def compiler = file("$compilerHome/bin/${compilerPrefix}gcc").getAbsolutePath()
+def linker = file("$compilerHome/bin/${compilerPrefix}g++").getAbsolutePath()
+
 // Declare whether this particular target file applies to the current system
 X86EGL.canBuild = (IS_LINUX || IS_MAC) && compilerHome.exists()
 if (!X86EGL.canBuild) {
@@ -72,12 +75,15 @@
 X86EGL.compileMediaNative = false;
 
 X86EGL.includeLens = true
+X86EGL.includeMonocle = true
 X86EGL.includeNull3d = true
 X86EGL.includeEGL = true
 X86EGL.includeSwing = false
 X86EGL.includeSWT = false
 X86EGL.includeGTK = true
 
+X86EGL.javafxPlatformDefault="monocle"
+
 // Libraries end up in the sdk/rt/lib/[i386|amd46] directory depending on machine arch
 if (rootProject.hasProperty("X86EGL_ARCH")) {
     X86EGL.arch = X86EGL_ARCH
@@ -167,7 +173,25 @@
         }
 )
 
-X86EGL.javafxPlatformProperties ="""javafx.platform=monocle
+def monoclePlatformAdditions = """
+monocle.glass.platform=Monocle
+monocle.prism.order=es2,sw
+monocle.prism.eglfb=true
+monocle.prism.lcdtext=false
+monocle.prism.maxvram=128m
+monocle.prism.targetvram=112m
+monocle.use.egl=true
+monocle.use.gles2=true
+monocle.embedded=monocle
+monocle.com.sun.javafx.isEmbedded=true
+monocle.doNativeComposite=true
+monocle.com.sun.javafx.scene.control.skin.FXVK.cache=true
+monocle.prism.glDepthSize=0
+monocle.com.sun.javafx.gestures.zoom=true
+monocle.com.sun.javafx.gestures.rotate=true
+monocle.com.sun.javafx.gestures.scroll=true"""
+
+def lensPlatformAdditions = """
 directfb.com.sun.javafx.scene.control.skin.ListViewSkin.pannable=true
 directfb.com.sun.javafx.scene.control.skin.TreeViewSkin.pannable=true
 directfb.com.sun.javafx.scene.control.skin.TableViewSkin.pannable=true
@@ -187,12 +211,15 @@
 eglfb.prism.order=es2
 eglfb.prism.eglfb=true
 eglfb.prism.lcdtext=false
+eglfb.prism.maxvram=128m
+eglfb.prism.targetvram=112m
 eglfb.use.egl=true
 eglfb.use.gles2=true
 eglfb.embedded=eglfb
 eglfb.com.sun.javafx.isEmbedded=true
 eglfb.doNativeComposite=true
 eglfb.com.sun.javafx.scene.control.skin.FXVK.cache=true
+eglfb.prism.glDepthSize=0
 eglfb.com.sun.javafx.gestures.zoom=true
 eglfb.com.sun.javafx.gestures.rotate=true
 eglfb.com.sun.javafx.gestures.scroll=true
@@ -208,22 +235,6 @@
 fb.com.sun.javafx.gestures.zoom=true
 fb.com.sun.javafx.gestures.rotate=true
 fb.com.sun.javafx.gestures.scroll=true
-monocle.glass.platform=Monocle
-monocle.prism.order=es2,sw
-monocle.prism.eglfb=true
-monocle.prism.lcdtext=false
-monocle.prism.maxvram=128m
-monocle.prism.targetvram=112m
-monocle.use.egl=true
-monocle.use.gles2=true
-monocle.embedded=monocle
-monocle.com.sun.javafx.isEmbedded=true
-monocle.doNativeComposite=true
-monocle.com.sun.javafx.scene.control.skin.FXVK.cache=true
-monocle.com.sun.javafx.gestures.zoom=true
-monocle.com.sun.javafx.gestures.rotate=true
-monocle.com.sun.javafx.gestures.scroll=true
-monocle.prism.glDepthSize=0
 eglx11.com.sun.javafx.scene.control.skin.ListViewSkin.pannable=true
 eglx11.com.sun.javafx.scene.control.skin.TreeViewSkin.pannable=true
 eglx11.com.sun.javafx.scene.control.skin.TableViewSkin.pannable=true
@@ -232,14 +243,19 @@
 eglx11.prism.order=es2
 eglx11.prism.eglx11=true
 eglx11.prism.lcdtext=false
+eglx11.prism.maxvram=128m
+eglx11.prism.targetvram=112m
 eglx11.use.egl=true
 eglx11.use.gles2=true
 eglx11.embedded=eglx11
 eglx11.com.sun.javafx.isEmbedded=true
 eglx11.com.sun.javafx.scene.control.skin.FXVK.cache=true
+eglx11.prism.glDepthSize=0
 eglx11.com.sun.javafx.gestures.zoom=true
 eglx11.com.sun.javafx.gestures.rotate=true
-eglx11.com.sun.javafx.gestures.scroll=true
+eglx11.com.sun.javafx.gestures.scroll=true"""
+
+def gtkPlatformAdditions = """
 gtk.com.sun.javafx.scene.control.skin.ListViewSkin.pannable=true
 gtk.com.sun.javafx.scene.control.skin.TreeViewSkin.pannable=true
 gtk.com.sun.javafx.scene.control.skin.TableViewSkin.pannable=true
@@ -300,20 +316,35 @@
     }
 )
 
-def compiler = file("$compilerHome/bin/${compilerPrefix}gcc").getAbsolutePath()
-def linker = file("$compilerHome/bin/${compilerPrefix}g++").getAbsolutePath()
+X86EGL.javafxPlatformProperties = "javafx.platform=${X86EGL.javafxPlatformDefault}"
 
 X86EGL.glass = [:]
-X86EGL.glass.variants = ["eglfb", "directfb", "fb", "gtk", "lensport", "monocle", "monocle_x11"]
 X86EGL.glass.javahInclude = [
     "com/sun/glass/events/**",
-    "com/sun/glass/ui/*",
-    "com/sun/glass/ui/lens/*",
-    "com/sun/glass/ui/monocle/*",
-    "com/sun/glass/ui/monocle/linux/*",
-    "com/sun/glass/ui/monocle/util/*",
-    "com/sun/glass/ui/monocle/x11/*",
-    "com/sun/glass/ui/gtk/*"]
+    "com/sun/glass/ui/*"]
+X86EGL.glass.variants = [ ]
+if (X86EGL.includeLens) { 
+    X86EGL.glass.variants.addAll("eglfb", "directfb", "fb", "lensport" );
+    X86EGL.glass.javahInclude.addAll("com/sun/glass/ui/lens/*");
+    X86EGL.javafxPlatformProperties = X86EGL.javafxPlatformProperties + lensPlatformAdditions
+}
+if (X86EGL.includeMonocle) { 
+    X86EGL.glass.variants.addAll("monocle", "monocle_x11");
+    X86EGL.glass.javahInclude.addAll(
+        "com/sun/glass/ui/monocle/*",
+        "com/sun/glass/ui/monocle/dispman/*",
+        "com/sun/glass/ui/monocle/mx6/*",
+        "com/sun/glass/ui/monocle/linux/*",
+        "com/sun/glass/ui/monocle/util/*",
+        "com/sun/glass/ui/monocle/x11/*");
+    X86EGL.javafxPlatformProperties = X86EGL.javafxPlatformProperties + monoclePlatformAdditions
+}
+if (X86EGL.includeGTK) {
+    X86EGL.glass.variants.addAll("gtk");
+    X86EGL.glass.javahInclude.addAll("com/sun/glass/ui/gtk/*");
+    X86EGL.javafxPlatformProperties = X86EGL.javafxPlatformProperties + gtkPlatformAdditions
+}
+
 X86EGL.glass.lib = "glass"
 
 X86EGL.glass.monocle = [:]