diff options
| author | Tor Norbye <tnorbye@google.com> | 2012-04-06 10:14:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-04-06 10:14:56 -0700 |
| commit | 765a2f274d320b62e0f552091506c084dd742fd8 (patch) | |
| tree | 1870189fa9f3193c6571deaa307a7f632d46e052 /traceview | |
| parent | f9762b8a4e0050ed040738acbd8fec750907ade4 (diff) | |
| parent | c2d5ffe0b9baa1c24a62459b82bb21df08f4250b (diff) | |
| download | sdk-765a2f274d320b62e0f552091506c084dd742fd8.zip sdk-765a2f274d320b62e0f552091506c084dd742fd8.tar.gz sdk-765a2f274d320b62e0f552091506c084dd742fd8.tar.bz2 | |
am c2d5ffe0: Merge changes I6708bd40,I72e28e21
* commit 'c2d5ffe0b9baa1c24a62459b82bb21df08f4250b':
Add support for the WindowBuilder Property Sheet
Switch libraries from Eclipse 3.4 to Eclipse 3.6.2
Diffstat (limited to 'traceview')
| -rw-r--r-- | traceview/.classpath | 6 | ||||
| -rw-r--r-- | traceview/src/Android.mk | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/traceview/.classpath b/traceview/.classpath index d27c013..301f785 100644 --- a/traceview/.classpath +++ b/traceview/.classpath @@ -5,8 +5,8 @@ <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_SRC/prebuilts/tools/common/eclipse/org.eclipse.core.commands_3.4.0.I20080509-2000.jar"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.equinox.common_3.4.0.v20080421-2006.jar"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.jface_3.4.2.M20090107-0800.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/src/Android.mk b/traceview/src/Android.mk index fd901f1..cd63141 100644 --- a/traceview/src/Android.mk +++ b/traceview/src/Android.mk @@ -11,9 +11,9 @@ LOCAL_JAVA_LIBRARIES := \ androidprefs \ sdkstats \ swt \ - org.eclipse.jface_3.4.2.M20090107-0800 \ - org.eclipse.equinox.common_3.4.0.v20080421-2006 \ - org.eclipse.core.commands_3.4.0.I20080509-2000 + org.eclipse.jface_3.6.2.M20110210-1200 \ + org.eclipse.equinox.common_3.6.0.v20100503 \ + org.eclipse.core.commands_3.6.0.I20100512-1500 LOCAL_MODULE := traceview include $(BUILD_HOST_JAVA_LIBRARY) |