changeset 6957:295b5b61e9c9

RT-36917,RT-36718 removing obsolete build-src/platforms usage, fixing monocle install Revieved-by: kcr
author ddhill
date Thu, 01 May 2014 10:37:16 -0400
parents 0e9455df94b1
children 686ac8b65d29
files buildSrc/armv5sf.gradle buildSrc/armv6hf.gradle buildSrc/armv6sf.gradle buildSrc/armv7hf.gradle buildSrc/armv7sf.gradle buildSrc/x86egl.gradle
diffstat 6 files changed, 85 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/buildSrc/armv5sf.gradle	Thu May 01 13:34:36 2014 +1200
+++ b/buildSrc/armv5sf.gradle	Thu May 01 10:37:16 2014 -0400
@@ -68,6 +68,7 @@
 ARMV5SF.compileDesignTime = false;
 
 // Libraries end up in the sdk/rt/lib/arm directory for arm builds
+ARMV5SF.arch = "arm"
 ARMV5SF.libDest = "lib/arm"
 
 // TODO this is garbage. Each target file should define what it includes,
@@ -603,3 +604,16 @@
 ARMV5SF.media.linker = linker
 ARMV5SF.media.extra_cflags = mediaCFlags.join(' ')
 ARMV5SF.media.extra_ldflags = mediaLFlags.join(' ')
+
+ARMV5SF.deploy = [:]
+ARMV5SF.deploy.publicLibraryFilter = [
+  "fxavcodecplugin-52.so",
+  "fxavcodecplugin-53.so",
+  "fxplugins.so",
+  "libjfxwebkit.so",
+  "libgstplugins-lite.so",
+  "libgstreamer-lite.so",
+  "libprism_es2_eglx11.so",
+  "libglass_lens_fb.so"
+]
+ARMV5SF.deploy.compressBigJar=true
--- a/buildSrc/armv6hf.gradle	Thu May 01 13:34:36 2014 +1200
+++ b/buildSrc/armv6hf.gradle	Thu May 01 10:37:16 2014 -0400
@@ -78,6 +78,7 @@
 ARMV6HF.compileDesignTime = false;
 
 // Libraries end up in the sdk/rt/lib/arm directory for arm builds
+ARMV6HF.arch = "arm"
 ARMV6HF.libDest = "lib/arm"
 
 // TODO this is garbage. Each target file should define what it includes,
@@ -601,3 +602,16 @@
 ARMV6HF.media.linker = linker
 ARMV6HF.media.extra_cflags = mediaCFlags.join(' ')
 ARMV6HF.media.extra_ldflags = mediaLFlags.join(' ')
+
+ARMV6HF.deploy = [:]
+ARMV6HF.deploy.publicLibraryFilter = [
+  "fxavcodecplugin-52.so",
+  "fxavcodecplugin-53.so",
+  "fxplugins.so",
+  "libjfxwebkit.so",
+  "libgstplugins-lite.so",
+  "libgstreamer-lite.so",
+  "libprism_es2_eglx11.so",
+  "libglass_lens_fb.so"
+]
+ARMV6HF.deploy.compressBigJar=true
--- a/buildSrc/armv6sf.gradle	Thu May 01 13:34:36 2014 +1200
+++ b/buildSrc/armv6sf.gradle	Thu May 01 10:37:16 2014 -0400
@@ -68,6 +68,7 @@
 ARMV6SF.compileDesignTime = false;
 
 // Libraries end up in the sdk/rt/lib/arm directory for arm builds
+ARMV6SF.arch = "arm"
 ARMV6SF.libDest = "lib/arm"
 
 // TODO this is garbage. Each target file should define what it includes,
@@ -603,3 +604,16 @@
 ARMV6SF.media.linker = linker
 ARMV6SF.media.extra_cflags = mediaCFlags.join(' ')
 ARMV6SF.media.extra_ldflags = mediaLFlags.join(' ')
+
+ARMV6SF.deploy = [:]
+ARMV6SF.deploy.publicLibraryFilter = [
+  "fxavcodecplugin-52.so",
+  "fxavcodecplugin-53.so",
+  "fxplugins.so",
+  "libjfxwebkit.so",
+  "libgstplugins-lite.so",
+  "libgstreamer-lite.so",
+  "libprism_es2_eglx11.so",
+  "libglass_lens_fb.so"
+]
+ARMV6SF.deploy.compressBigJar=true
--- a/buildSrc/armv7hf.gradle	Thu May 01 13:34:36 2014 +1200
+++ b/buildSrc/armv7hf.gradle	Thu May 01 10:37:16 2014 -0400
@@ -78,6 +78,7 @@
 ARMV7HF.compileDesignTime = false;
 
 // Libraries end up in the sdk/rt/lib/arm directory for arm builds
+ARMV7HF.arch = "arm"
 ARMV7HF.libDest = "lib/arm"
 
 // TODO this is garbage. Each target file should define what it includes,
@@ -581,3 +582,16 @@
 ARMV7HF.media.linker = linker
 ARMV7HF.media.extra_cflags = mediaCFlags.join(' ')
 ARMV7HF.media.extra_ldflags = mediaLFlags.join(' ')
+
+ARMV7HF.deploy = [:]
+ARMV7HF.deploy.publicLibraryFilter = [
+  "fxavcodecplugin-52.so",
+  "fxavcodecplugin-53.so",
+  "fxplugins.so",
+  "libjfxwebkit.so",
+  "libgstplugins-lite.so",
+  "libgstreamer-lite.so",
+  "libprism_es2_eglx11.so",
+  "libglass_lens_fb.so"
+]
+ARMV7HF.deploy.compressBigJar=true
--- a/buildSrc/armv7sf.gradle	Thu May 01 13:34:36 2014 +1200
+++ b/buildSrc/armv7sf.gradle	Thu May 01 10:37:16 2014 -0400
@@ -68,6 +68,7 @@
 ARMV7SF.compileDesignTime = false;
 
 // Libraries end up in the sdk/rt/lib/arm directory for arm builds
+ARMV7SF.arch = "arm"
 ARMV7SF.libDest = "lib/arm"
 
 // TODO this is garbage. Each target file should define what it includes,
@@ -603,3 +604,16 @@
 ARMV7SF.media.linker = linker
 ARMV7SF.media.extra_cflags = mediaCFlags.join(' ')
 ARMV7SF.media.extra_ldflags = mediaLFlags.join(' ')
+
+ARMV7SF.deploy = [:]
+ARMV7SF.deploy.publicLibraryFilter = [
+  "fxavcodecplugin-52.so",
+  "fxavcodecplugin-53.so",
+  "fxplugins.so",
+  "libjfxwebkit.so",
+  "libgstplugins-lite.so",
+  "libgstreamer-lite.so",
+  "libprism_es2_eglx11.so",
+  "libglass_lens_fb.so"
+]
+ARMV7SF.deploy.compressBigJar=true
--- a/buildSrc/x86egl.gradle	Thu May 01 13:34:36 2014 +1200
+++ b/buildSrc/x86egl.gradle	Thu May 01 10:37:16 2014 -0400
@@ -69,7 +69,8 @@
 X86EGL.compileFXPackager = false;
 X86EGL.compileDesignTime = false;
 
-// Libraries end up in the sdk/rt/lib/arm directory for arm builds
+// Libraries end up in the sdk/rt/lib/i386 directory for i386 builds
+X86EGL.arch = "i386"
 X86EGL.libDest = "lib/i386"
 
 // TODO this is garbage. Each target file should define what it includes,
@@ -523,3 +524,16 @@
 X86EGL.media.compiler = compiler
 X86EGL.media.linker = linker
 X86EGL.media.lib = "ar"
+
+X86EG.deploy = [:]
+X86EG.deploy.publicLibraryFilter = [
+  "fxavcodecplugin-52.so",
+  "fxavcodecplugin-53.so",
+  "fxplugins.so",
+  "libjfxwebkit.so",
+  "libgstplugins-lite.so",
+  "libgstreamer-lite.so",
+  "libprism_es2_eglx11.so",
+  "libglass_lens_fb.so"
+]
+X86EG.deploy.compressBigJar=true