diff options
author | Xavier Ducrohet <xav@google.com> | 2014-06-19 00:14:50 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-19 00:14:50 +0000 |
commit | 25f4098102eb338cbd64851d78e9229e631e0d75 (patch) | |
tree | b1e8993d960baef19c130c429e306b7ea4307137 | |
parent | 3f0200f808faa5edc6e0c58636bff4685376aec8 (diff) | |
parent | d12f0f27037f4570318b931fcf12033022b1edfd (diff) | |
download | sdk-25f4098102eb338cbd64851d78e9229e631e0d75.zip sdk-25f4098102eb338cbd64851d78e9229e631e0d75.tar.gz sdk-25f4098102eb338cbd64851d78e9229e631e0d75.tar.bz2 |
am d12f0f27: am 3ff68051: Merge "Fix find_java." into idea133 automerge: 1b20fb2
* commit 'd12f0f27037f4570318b931fcf12033022b1edfd':
Fix find_java.
monitor: Remove unnecessary plugins during release
-rw-r--r-- | find_java/build.gradle | 6 | ||||
-rw-r--r-- | monitor/build.gradle | 34 |
2 files changed, 40 insertions, 0 deletions
diff --git a/find_java/build.gradle b/find_java/build.gradle index 12511fd..b1dfa79 100644 --- a/find_java/build.gradle +++ b/find_java/build.gradle @@ -20,8 +20,14 @@ sources { sdk { windows { item( { getExeName("windows") } ) { + into 'lib' name 'find_java.exe' builtBy 'findJavaExecutable' + notice 'NOTICE' + } + item('find_java.bat') { + into 'lib' + notice 'NOTICE' } } } diff --git a/monitor/build.gradle b/monitor/build.gradle index c203c2b..211ca0c 100644 --- a/monitor/build.gradle +++ b/monitor/build.gradle @@ -54,27 +54,61 @@ sdk { } } +// Using PDE build, the size of monitor was 43M +// With Tycho, we are at close to 75M. Until we figure out the proper way +// to exclude unnecessary content, we just remove these plugins from the final build. +def pluginsToRemove = [ + 'org.eclipse.platform.doc.user_4.2.2.v20130121-200410.jar', + 'org.eclipse.debug.ui_3.8.2.v20130130-171415.ja', + 'org.apache.jasper.glassfish_2.2.2.v201205150955.jar', + 'org.eclipse.team.ui_3.6.201.v20130125-135424.jar', + 'org.apache.lucene.core_2.9.1.v201101211721.jar', + 'org.eclipse.help.webapp_3.6.101.v20130116-182509.jar', + 'org.eclipse.help.ui_3.5.201.v20130108-092756.jar', + 'org.eclipse.help.base_3.6.101.v201302041200.jar', + 'org.eclipse.team.core_3.6.100.v20120524-0627.jar', + 'org.eclipse.jetty.server_8.1.3.v20120522.jar', + 'org.eclipse.ui.intro_3.4.200.v20120521-2344.jar', + 'org.eclipse.ui.cheatsheets_3.4.200.v20120521-2344.jar', + 'org.apache.ant_1.8.3.v201301120609/**' +] + task unzipLinux64(type: Copy) { from zipTree(file(basePath + 'monitorproduct-linux.gtk.x86_64.zip')) into file(basePath + 'lin64/') + pluginsToRemove.each { + exclude "**/$it" + } } task unzipLinux(type: Copy) { from zipTree(file(basePath + 'monitorproduct-linux.gtk.x86.zip')) into file(basePath + 'lin/') + pluginsToRemove.each { + exclude "**/$it" + } } task unzipMac64(type: Copy) { from zipTree(file(basePath + 'monitorproduct-macosx.cocoa.x86_64.zip')) into file(basePath + 'mac64/') + pluginsToRemove.each { + exclude "**/$it" + } } task unzipWin64(type: Copy) { from zipTree(file(basePath + 'monitorproduct-win32.win32.x86_64.zip')) into file(basePath + 'win64/') + pluginsToRemove.each { + exclude "**/$it" + } } task unzipWin(type: Copy) { from zipTree(file(basePath + 'monitorproduct-win32.win32.x86.zip')) into file(basePath + 'win/') + pluginsToRemove.each { + exclude "**/$it" + } } |