[go: nahoru, domu]

Fix eclipse project dependencies.

- Use the prebuilts from the maven repo
- Make each project exports its dependencies to avoid having to
  redefine them in all projects.

Change-Id: Ib4c8fc192da224ff6fc765725cb106c865eebb97
diff --git a/chimpchat/.classpath b/chimpchat/.classpath
index 550f745..294fce8 100644
--- a/chimpchat/.classpath
+++ b/chimpchat/.classpath
@@ -10,9 +10,8 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/sdklib"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
 	<classpathentry kind="var" path="ANDROID_OUT_FRAMEWORK/swt.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.core.commands_3.6.0.I20100512-1500.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.equinox.common_3.6.0.v20100503.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.jface_3.6.2.M20110210-1200.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-13.0.1.jar"/>
+	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/com/android/external/eclipse/org-eclipse-core-commands/3.6.0/org-eclipse-core-commands-3.6.0.jar"/>
+	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/com/android/external/eclipse/org-eclipse-equinox-common/3.6.0/org-eclipse-equinox-common-3.6.0.jar"/>
+	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/com/android/external/eclipse/org-eclipse-jface/3.6.2/org-eclipse-jface-3.6.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/ddms/app/.classpath b/ddms/app/.classpath
index 50b7a68..6c323f6 100644
--- a/ddms/app/.classpath
+++ b/ddms/app/.classpath
@@ -5,12 +5,7 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/ddmuilib"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/sdkstats"/>
-	<classpathentry kind="var" path="ANDROID_OUT_FRAMEWORK/swt.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.core.commands_3.6.0.I20100512-1500.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.equinox.common_3.6.0.v20100503.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.jface_3.6.2.M20110210-1200.jar"/>
-	<classpathentry kind="var" path="ANDROID_OUT_FRAMEWORK/swtmenubar.jar" sourcepath="/ANDROID_SRC/sdk/swtmenubar/src"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/osgi/osgi.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/common"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/swtmenubar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/ddms/ddmuilib/.classpath b/ddms/ddmuilib/.classpath
index 829ac1c..07c1198 100644
--- a/ddms/ddmuilib/.classpath
+++ b/ddms/ddmuilib/.classpath
@@ -3,15 +3,14 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/ddmlib"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
-	<classpathentry kind="var" path="ANDROID_OUT_FRAMEWORK/swt.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.core.commands_3.6.0.I20100512-1500.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.equinox.common_3.6.0.v20100503.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.jface_3.6.2.M20110210-1200.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/jfreechart/jcommon-1.0.12.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/jfreechart/jfreechart-1.0.9-swt.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/jfreechart/jfreechart-1.0.9.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-13.0.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/>
+	<classpathentry exported="true" kind="var" path="ANDROID_OUT_FRAMEWORK/swt.jar"/>
+	<classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/com/android/external/eclipse/org-eclipse-core-commands/3.6.0/org-eclipse-core-commands-3.6.0.jar"/>
+	<classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/com/android/external/eclipse/org-eclipse-equinox-common/3.6.0/org-eclipse-equinox-common-3.6.0.jar"/>
+	<classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/com/android/external/eclipse/org-eclipse-jface/3.6.2/org-eclipse-jface-3.6.2.jar"/>
+	<classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/jfree/jfreechart/1.0.9/jfreechart-1.0.9.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/m2/repository/jfree/jfreechart/1.0.9/jfreechart-1.0.9-sources.jar"/>
+	<classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/jfree/jfreechart-swt/1.0.9/jfreechart-swt-1.0.9.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/m2/repository/jfree/jfreechart-swt/1.0.9/jfreechart-swt-1.0.9-sources.jar"/>
+	<classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/jfree/jcommon/1.0.12/jcommon-1.0.12.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/m2/repository/jfree/jcommon/1.0.12/jcommon-1.0.12-sources.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/hierarchyviewer2/app/.classpath b/hierarchyviewer2/app/.classpath
index c6b33af..67d8beb 100644
--- a/hierarchyviewer2/app/.classpath
+++ b/hierarchyviewer2/app/.classpath
@@ -2,15 +2,11 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/hierarchyviewer2lib"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ddmuilib"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/sdklib"/>
-	<classpathentry kind="var" path="ANDROID_OUT_FRAMEWORK/swtmenubar.jar" sourcepath="/ANDROID_SRC/sdk/swtmenubar/src"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/linux-x86/swt/swt.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.core.commands_3.6.0.I20100512-1500.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.equinox.common_3.6.0.v20100503.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.jface_3.6.2.M20110210-1200.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/common"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/hierarchyviewer2lib"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/ddmlib"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/ddmuilib"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/sdklib"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/common"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/swtmenubar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/hierarchyviewer2/hierarchyviewer2lib/.classpath b/hierarchyviewer2/hierarchyviewer2lib/.classpath
index 7962d16..3cb0312 100644
--- a/hierarchyviewer2/hierarchyviewer2lib/.classpath
+++ b/hierarchyviewer2/hierarchyviewer2lib/.classpath
@@ -2,13 +2,8 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ddmuilib"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/common"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-13.0.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/linux-x86/swt/swt.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.core.commands_3.6.0.I20100512-1500.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.equinox.common_3.6.0.v20100503.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.jface_3.6.2.M20110210-1200.jar"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/ddmlib"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/ddmuilib"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/common"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/sdkmanager/app/.classpath b/sdkmanager/app/.classpath
index 98cdeb1..2646f01 100644
--- a/sdkmanager/app/.classpath
+++ b/sdkmanager/app/.classpath
@@ -3,14 +3,10 @@
 	<classpathentry excluding="**/Android.mk" kind="src" path="src/main/java"/>
 	<classpathentry excluding="**/Android.mk" kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/sdklib"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/sdkuilib"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/sdklib"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/sdkuilib"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/common"/>
-	<classpathentry kind="var" path="ANDROID_OUT_FRAMEWORK/swt.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.core.commands_3.6.0.I20100512-1500.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.equinox.common_3.6.0.v20100503.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.jface_3.6.2.M20110210-1200.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-13.0.1.jar"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/common"/>
+	<classpathentry exported="true" kind="var" path="ANDROID_OUT_FRAMEWORK/swt.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/sdkmanager/sdkuilib/.classpath b/sdkmanager/sdkuilib/.classpath
index 7ea93e2..8d67591 100644
--- a/sdkmanager/sdkuilib/.classpath
+++ b/sdkmanager/sdkuilib/.classpath
@@ -3,20 +3,11 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/sdklib"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/sdklib"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
-	<classpathentry kind="var" path="ANDROID_OUT_FRAMEWORK/swtmenubar.jar" sourcepath="/ANDROID_SRC/sdk/swtmenubar/src"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.core.commands_3.6.0.I20100512-1500.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.equinox.common_3.6.0.v20100503.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.jface_3.6.2.M20110210-1200.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/http-client/commons-codec-1.4.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/http-client/commons-logging-1.1.1.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/http-client/httpclient-4.1.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/http-client/src/httpcomponents-client-4.1.1-src.zip"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/http-client/httpcore-4.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/http-client/src/httpcomponents-core-4.1-src.zip"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/http-client/httpmime-4.1.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/http-client/src/httpcomponents-client-4.1.1-src.zip"/>
-	<classpathentry kind="var" path="ANDROID_OUT_FRAMEWORK/swt.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/layoutlib-api"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/common"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-13.0.1.jar"/>
+	<classpathentry exported="true" kind="var" path="ANDROID_OUT_FRAMEWORK/swt.jar"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/layoutlib-api"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/common"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/swtmenubar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/sdkmanager/sdkuilib/build.gradle b/sdkmanager/sdkuilib/build.gradle
index 6dc2ccc..d77e81f 100644
--- a/sdkmanager/sdkuilib/build.gradle
+++ b/sdkmanager/sdkuilib/build.gradle
@@ -5,10 +5,6 @@
     compile project(':swtmenubar')
     compile "com.android.tools:sdklib:$version"
 
-    compile 'org.apache.commons:commons-compress:1.0'
-    compile 'org.apache.httpcomponents:httpclient:4.1.1'
-    compile 'org.apache.httpcomponents:httpmime:4.1'
-
     testCompile "com.android.tools:sdklib-test:$version"
     testCompile 'junit:junit:3.8.1'
 }
diff --git a/swtmenubar/.classpath b/swtmenubar/.classpath
index 336c3a2..25adf96 100644
--- a/swtmenubar/.classpath
+++ b/swtmenubar/.classpath
@@ -2,9 +2,9 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="ANDROID_OUT_FRAMEWORK/swt.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.core.commands_3.6.0.I20100512-1500.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.equinox.common_3.6.0.v20100503.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.jface_3.6.2.M20110210-1200.jar"/>
+	<classpathentry exported="true" kind="var" path="ANDROID_OUT_FRAMEWORK/swt.jar"/>
+	<classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/com/android/external/eclipse/org-eclipse-core-commands/3.6.0/org-eclipse-core-commands-3.6.0.jar"/>
+	<classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/com/android/external/eclipse/org-eclipse-equinox-common/3.6.0/org-eclipse-equinox-common-3.6.0.jar"/>
+	<classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/com/android/external/eclipse/org-eclipse-jface/3.6.2/org-eclipse-jface-3.6.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/swtmenubar/src/main/java/com/android/menubar/MenuBarEnhancer.java b/swtmenubar/src/main/java/com/android/menubar/MenuBarEnhancer.java
index 7575ecd..8fc8213 100644
--- a/swtmenubar/src/main/java/com/android/menubar/MenuBarEnhancer.java
+++ b/swtmenubar/src/main/java/com/android/menubar/MenuBarEnhancer.java
@@ -16,6 +16,8 @@
 
 package com.android.menubar;
 
+import com.android.menubar.IMenuBarEnhancer.MenuBarMode;
+
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.Separator;
@@ -26,8 +28,6 @@
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.MenuItem;
 
-import com.android.menubar.IMenuBarEnhancer.MenuBarMode;
-
 
 /**
  * On Mac, {@link MenuBarEnhancer#setupMenu} plugs a listener on the About and the
@@ -94,10 +94,12 @@
         IMenuBarEnhancer enhancer;
         enhancer = new IMenuBarEnhancer() {
 
+            @Override
             public MenuBarMode getMenuBarMode() {
                 return MenuBarMode.GENERIC;
             }
 
+            @Override
             public void setupMenu(
                     String appName,
                     Display display,
@@ -153,16 +155,19 @@
             final IAction quitAction) {
 
         IMenuBarCallback callbacks = new IMenuBarCallback() {
+            @Override
             public void printError(String format, Object... args) {
                 System.err.println(String.format(format, args));
             }
 
+            @Override
             public void onPreferencesMenuSelected() {
                 if (preferencesAction != null) {
                     preferencesAction.run();
                 }
             }
 
+            @Override
             public void onAboutMenuSelected() {
                 if (aboutAction != null) {
                     aboutAction.run();
@@ -176,10 +181,12 @@
         if (enhancer == null) {
             enhancer = new IMenuBarEnhancer() {
 
+                @Override
                 public MenuBarMode getMenuBarMode() {
                     return MenuBarMode.GENERIC;
                 }
 
+                @Override
                 public void setupMenu(
                         String appName,
                         Display display,
diff --git a/swtmenubar/src/main/java/com/android/menubar/MenuBarEnhancer37.java b/swtmenubar/src/main/java/com/android/menubar/MenuBarEnhancer37.java
index 8560bfa..0e8df09 100644
--- a/swtmenubar/src/main/java/com/android/menubar/MenuBarEnhancer37.java
+++ b/swtmenubar/src/main/java/com/android/menubar/MenuBarEnhancer37.java
@@ -38,6 +38,7 @@
     public MenuBarEnhancer37() {
     }
 
+    @Override
     public MenuBarMode getMenuBarMode() {
         return MenuBarMode.MAC_OS;
     }
@@ -50,6 +51,7 @@
      * @param display The SWT display. Must not be null.
      * @param callbacks The callbacks invoked by the menus.
      */
+    @Override
     public void setupMenu(
             String appName,
             Display display,
@@ -64,6 +66,7 @@
 
         // Schedule disposal of callback object
         display.disposeExec(new Runnable() {
+            @Override
             public void run() {
             }
         });
diff --git a/uiautomatorviewer/.classpath b/uiautomatorviewer/.classpath
index 9aaea29..1ce5b77 100644
--- a/uiautomatorviewer/.classpath
+++ b/uiautomatorviewer/.classpath
@@ -4,9 +4,9 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/>
 	<classpathentry kind="var" path="ANDROID_OUT_FRAMEWORK/swt.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.core.commands_3.6.0.I20100512-1500.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.equinox.common_3.6.0.v20100503.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.jface_3.6.2.M20110210-1200.jar"/>
+	<classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/com/android/external/eclipse/org-eclipse-core-commands/3.6.0/org-eclipse-core-commands-3.6.0.jar"/>
+	<classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/com/android/external/eclipse/org-eclipse-equinox-common/3.6.0/org-eclipse-equinox-common-3.6.0.jar"/>
+	<classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/com/android/external/eclipse/org-eclipse-jface/3.6.2/org-eclipse-jface-3.6.2.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/common"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>