diff options
author | Raphael Moll <ralf@android.com> | 2012-04-12 14:59:12 -0700 |
---|---|---|
committer | Raphael Moll <ralf@android.com> | 2012-04-12 15:02:18 -0700 |
commit | 82d381553aa80cdc80a776a45d803b615f3ea5ab (patch) | |
tree | 4a5b0c305d27ff0e323e8973ba3fc775251abbfe | |
parent | 9111d3953d094a9c14fe13975f2d24cfa67a84f6 (diff) | |
download | sdk-82d381553aa80cdc80a776a45d803b615f3ea5ab.zip sdk-82d381553aa80cdc80a776a45d803b615f3ea5ab.tar.gz sdk-82d381553aa80cdc80a776a45d803b615f3ea5ab.tar.bz2 |
SDK: Fix classpath for eclipse projects.
swt.jar must be found relative to the out/ dir
(as generated by create_all_symlinks.sh) to avoid
setting a platform-specific path.
swtmenubar was missing the new libs references.
Change-Id: I365cfa6e011ec831c4df87cb36b0df722caac2e4
-rw-r--r-- | ddms/app/.classpath | 2 | ||||
-rw-r--r-- | ddms/libs/ddmuilib/.classpath | 2 | ||||
-rw-r--r-- | sdkmanager/app/.classpath | 21 | ||||
-rw-r--r-- | sdkmanager/libs/sdkuilib/.classpath | 2 | ||||
-rw-r--r-- | sdkstats/.classpath | 2 | ||||
-rw-r--r-- | swtmenubar/.classpath | 5 | ||||
-rw-r--r-- | traceview/.classpath | 2 |
7 files changed, 19 insertions, 17 deletions
diff --git a/ddms/app/.classpath b/ddms/app/.classpath index f8f8a9c..7c7c6ee 100644 --- a/ddms/app/.classpath +++ b/ddms/app/.classpath @@ -6,7 +6,7 @@ <classpathentry combineaccessrules="false" kind="src" path="/ddmuilib"/> <classpathentry combineaccessrules="false" kind="src" path="/AndroidPrefs"/> <classpathentry combineaccessrules="false" kind="src" path="/SdkStatsService"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/linux-x86/swt/swt.jar"/> + <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"/> diff --git a/ddms/libs/ddmuilib/.classpath b/ddms/libs/ddmuilib/.classpath index 027a79c..01d110b 100644 --- a/ddms/libs/ddmuilib/.classpath +++ b/ddms/libs/ddmuilib/.classpath @@ -3,7 +3,7 @@ <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/linux-x86/swt/swt.jar"/> + <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"/> diff --git a/sdkmanager/app/.classpath b/sdkmanager/app/.classpath index 6ca79d9..acc6bfa 100644 --- a/sdkmanager/app/.classpath +++ b/sdkmanager/app/.classpath @@ -1,17 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry excluding="**/Android.mk" kind="src" path="src"/> - <classpathentry excluding="**/Android.mk" kind="src" path="tests"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/SdkLib"/> - <classpathentry combineaccessrules="false" kind="src" path="/AndroidPrefs"/> - <classpathentry combineaccessrules="false" 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_SRC/prebuilts/tools/linux-x86/swt/swt.jar"/> + <classpathentry excluding="**/Android.mk" kind="src" path="src"/> + <classpathentry excluding="**/Android.mk" kind="src" path="tests"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry combineaccessrules="false" kind="src" path="/SdkLib"/> + <classpathentry combineaccessrules="false" kind="src" path="/AndroidPrefs"/> + <classpathentry combineaccessrules="false" 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="output" path="bin"/> + <classpathentry kind="output" path="bin"/> </classpath> - diff --git a/sdkmanager/libs/sdkuilib/.classpath b/sdkmanager/libs/sdkuilib/.classpath index 3517cf7..f90fd36 100644 --- a/sdkmanager/libs/sdkuilib/.classpath +++ b/sdkmanager/libs/sdkuilib/.classpath @@ -11,6 +11,6 @@ <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/linux-x86/swt/swt.jar"/> + <classpathentry kind="var" path="ANDROID_OUT_FRAMEWORK/swt.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/sdkstats/.classpath b/sdkstats/.classpath index 299175e..b7d08e6 100644 --- a/sdkstats/.classpath +++ b/sdkstats/.classpath @@ -4,7 +4,7 @@ <classpathentry kind="src" path="tests"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/AndroidPrefs"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/linux-x86/swt/swt.jar"/> + <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"/> diff --git a/swtmenubar/.classpath b/swtmenubar/.classpath index 0f69dc5..d0bf6fd 100644 --- a/swtmenubar/.classpath +++ b/swtmenubar/.classpath @@ -2,6 +2,9 @@ <classpath> <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ANDROID_SWT"/> + <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="output" path="bin"/> </classpath> diff --git a/traceview/.classpath b/traceview/.classpath index 301f785..34066de 100644 --- a/traceview/.classpath +++ b/traceview/.classpath @@ -4,7 +4,7 @@ <classpathentry kind="src" path="src/resources"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/SdkStatsService"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/linux-x86/swt/swt.jar"/> + <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"/> |