diff options
| author | Siva Velusamy <vsiva@google.com> | 2014-07-01 00:14:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-07-01 00:14:01 +0000 |
| commit | 9d463c3ad5f3e2aaf78cc91a6bb31cbb9b69bee7 (patch) | |
| tree | 8b95b6ebf409708b17437164a1e8502ae61bdca2 /eclipse/artifacts/bundles/ide.product | |
| parent | 28cf8e13fc4d8d211ff8f7de2cbed1cd6945f30a (diff) | |
| parent | 964e8b728f2f239b5a01afc23d3bf7a8c0355511 (diff) | |
| download | sdk-9d463c3ad5f3e2aaf78cc91a6bb31cbb9b69bee7.zip sdk-9d463c3ad5f3e2aaf78cc91a6bb31cbb9b69bee7.tar.gz sdk-9d463c3ad5f3e2aaf78cc91a6bb31cbb9b69bee7.tar.bz2 | |
Merge "Set default product" into idea133
automerge: 964e8b7
* commit '964e8b728f2f239b5a01afc23d3bf7a8c0355511':
Set default product
Diffstat (limited to 'eclipse/artifacts/bundles/ide.product')
| -rw-r--r-- | eclipse/artifacts/bundles/ide.product | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/eclipse/artifacts/bundles/ide.product b/eclipse/artifacts/bundles/ide.product index 81d7c9d..b64b9d0 100644 --- a/eclipse/artifacts/bundles/ide.product +++ b/eclipse/artifacts/bundles/ide.product @@ -1,20 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="eclipse" uid="adtproduct" id="adtproduct" application="org.eclipse.ui.ide.workbench" version="23.0.1.qualifier" useFeatures="true" includeLaunchers="true"> +<product name="Eclipse IDE for Android Developers" uid="adtproduct" id="com.android.ide.eclipse.adt.package.adtproduct" application="org.eclipse.ui.ide.workbench" version="23.0.1.qualifier" useFeatures="true" includeLaunchers="true"> + + <aboutInfo> + <image path="/plugin-adt-package/adt-about.png"/> + <text> + Specified in the plugin.xml of the branding plugin. + </text> + </aboutInfo> <configIni use="default"> </configIni> <launcherArgs> - <programArgs>-product adtproduct</programArgs> - <programArgsWin>--launcher.XXMaxPermSize 256M</programArgsWin> - <vmArgs>-Dosgi.requiredJavaVersion=1.6 -Xms40m -Xmx768m</vmArgs> - <vmArgsLin>-XX:MaxPermSize=256m</vmArgsLin> + <programArgs>-product com.android.ide.eclipse.adt.package.adtproduct</programArgs> + <vmArgs>-Dosgi.requiredJavaVersion=1.6 +-XX:MaxPermSize=256m +-Xms512m +-Xmx1024m</vmArgs> <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac> </launcherArgs> - <windowImages/> + <windowImages i16="/plugin-adt-package/icons/adt16.png" i32="/plugin-adt-package/icons/adt32.png" i48="/plugin-adt-package/icons/adt48.png"/> <splash location="com.android.ide.eclipse.adt.package" /> @@ -25,6 +33,7 @@ </win> </launcher> + <vm> <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</linux> <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</macos> @@ -36,17 +45,13 @@ <features> <feature id="com.android.ide.eclipse.adt.package.feature" version="23.0.1.qualifier"/> - <feature id="com.android.ide.eclipse.adt.feature" version="23.0.1.qualifier"/> - <feature id="com.android.ide.eclipse.ddms.feature" version="23.0.1.qualifier"/> - <feature id="com.android.ide.eclipse.gldebugger.feature" version="23.0.1.qualifier"/> - <feature id="com.android.ide.eclipse.hierarchyviewer.feature" version="23.0.1.qualifier"/> - <feature id="com.android.ide.eclipse.ndk.feature" version="23.0.1.qualifier"/> - <feature id="com.android.ide.eclipse.traceview.feature" version="23.0.1.qualifier"/> </features> <configurations> - <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" /> - <property name="eclipse.product" value="adtproduct" /> + <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="0" /> + <property name="eclipse.product" value="com.android.ide.eclipse.adt.package.adtproduct" /> <property name="org.eclipse.update.reconcile" value="false" /> <property name="osgi.bundles.defaultStartLevel" value="4" /> <property name="osgi.splashPath" value="platform\:/base/plugins/com.android.ide.eclipse.adt.package" /> |