diff options
| author | Xavier Ducrohet <xav@android.com> | 2013-03-18 14:16:23 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2013-03-18 14:16:23 -0700 |
| commit | b96e1903996a3443a34a5f4de1fe9ac1bf3aa4a3 (patch) | |
| tree | 213c07acbe88bc275ba33b93675c41f79f497bef /ddms | |
| parent | a30665982d8dfc5906ac0083ceb41822c9af2e16 (diff) | |
| download | swt-b96e1903996a3443a34a5f4de1fe9ac1bf3aa4a3.tar.gz | |
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
Diffstat (limited to 'ddms')
| -rw-r--r-- | ddms/app/.classpath | 7 | ||||
| -rw-r--r-- | ddms/ddmuilib/.classpath | 17 |
2 files changed, 9 insertions, 15 deletions
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> |