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 /sdkmanager | |
| 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
Diffstat (limited to 'sdkmanager')
| -rw-r--r-- | sdkmanager/app/.classpath | 21 | ||||
| -rw-r--r-- | sdkmanager/libs/sdkuilib/.classpath | 2 |
2 files changed, 11 insertions, 12 deletions
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> |