diff options
| author | Tor Norbye <tnorbye@google.com> | 2012-04-10 08:39:40 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-04-10 08:39:41 -0700 |
| commit | 2bc0a4782a27273ecdb85b85e4f9f957c12f8d53 (patch) | |
| tree | c7344ba7070a89f5c3777c5f395762f98ca28215 /eclipse | |
| parent | 2281b808ca352c406a3655c17ab5a7f82f4978de (diff) | |
| parent | fb38fc81fb367f6c5589a90e0c85892a7c5560d5 (diff) | |
| download | sdk-2bc0a4782a27273ecdb85b85e4f9f957c12f8d53.zip sdk-2bc0a4782a27273ecdb85b85e4f9f957c12f8d53.tar.gz sdk-2bc0a4782a27273ecdb85b85e4f9f957c12f8d53.tar.bz2 | |
Merge "Add JDK 6 dependency for the ADT plugins"
Diffstat (limited to 'eclipse')
9 files changed, 9 insertions, 0 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/META-INF/MANIFEST.MF index c7ed760..734e8e1 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/META-INF/MANIFEST.MF @@ -16,3 +16,4 @@ Require-Bundle: org.eclipse.core.runtime, com.android.ide.eclipse.adt Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.jface.text.formatter +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF index dcef3c9..9388d69 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF @@ -128,5 +128,6 @@ Export-Package: com.android.ide.common.layout;x-friends:="com.android.ide.eclips org.kxml2.wap.wml;x-friends:="com.android.ide.eclipse.tests", org.kxml2.wap.wv;x-friends:="com.android.ide.eclipse.tests", org.xmlpull.v1;x-friends:="com.android.ide.eclipse.tests" +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF index 7c2bfc8..ba15622 100644 --- a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF @@ -100,3 +100,4 @@ Export-Package: com.android, org.apache.http.params, org.apache.http.protocol, org.apache.http.util +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF index 8f38856..47c8265 100644 --- a/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF @@ -36,3 +36,4 @@ Bundle-ClassPath: ., libs/jcommon-1.0.12.jar, libs/jfreechart-1.0.9.jar, libs/jfreechart-1.0.9-swt.jar +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF index 884b4b6..cbd95da 100644 --- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF @@ -21,3 +21,4 @@ Export-Package: com.android.ide.eclipse.gldebugger;x-friends:="com.android.ide.e com.android.ide.eclipse.gltrace;x-friends:="com.android.ide.eclipse.gldebugger.tests", com.android.ide.eclipse.gltrace.format;x-friends:="com.android.ide.eclipse.gldebugger.tests", com.android.ide.eclipse.gltrace.model;x-friends:="com.android.ide.eclipse.gldebugger.tests" +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF index 931cb30..b7b284a 100644 --- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF @@ -14,3 +14,4 @@ Require-Bundle: org.eclipse.ui, Bundle-ClassPath: ., libs/hierarchyviewerlib.jar Export-Package: com.android.ide.eclipse.hierarchyviewer +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF index 28fb55f..b0ffa36 100644 --- a/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF @@ -12,3 +12,4 @@ Require-Bundle: org.eclipse.ui, Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor Bundle-ClassPath: . +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF index a388a3e..0ecba08 100644 --- a/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF @@ -18,3 +18,4 @@ Require-Bundle: org.eclipse.ui, org.eclipse.ui.ide Bundle-Activator: com.android.ide.eclipse.pdt.PdtPlugin Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF index 456e8b6..f047c0b 100644 --- a/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF @@ -14,3 +14,4 @@ Bundle-ActivationPolicy: lazy Bundle-ClassPath: ., libs/traceview.jar Bundle-Vendor: The Android Open Source Project +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 |