diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-08-10 18:30:26 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2012-08-13 17:37:44 -0700 |
| commit | 81cefe2a26dd6db8a878e30874d12cdcbff0e83b (patch) | |
| tree | 970e5de5045fe1fa5255c3dd868cecc413f23beb /ddms | |
| parent | eb0e35abd8ec368b10ec2026642583ac8b330929 (diff) | |
| download | sdk-81cefe2a26dd6db8a878e30874d12cdcbff0e83b.zip sdk-81cefe2a26dd6db8a878e30874d12cdcbff0e83b.tar.gz sdk-81cefe2a26dd6db8a878e30874d12cdcbff0e83b.tar.bz2 | |
More refactoring.
Move stuff out of sdklib into common and ide_common.
Remove androidprefs and move the one class into common.
Change-Id: I71d126a13cf2ba413692e29616f4968a37d7b33a
Diffstat (limited to 'ddms')
| -rw-r--r-- | ddms/app/.classpath | 2 | ||||
| -rw-r--r-- | ddms/app/Android.mk | 2 | ||||
| -rw-r--r-- | ddms/app/etc/manifest.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ddms/app/.classpath b/ddms/app/.classpath index 7c7c6ee..180c9e4 100644 --- a/ddms/app/.classpath +++ b/ddms/app/.classpath @@ -4,7 +4,6 @@ <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="/AndroidPrefs"/> <classpathentry combineaccessrules="false" kind="src" path="/SdkStatsService"/> <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"/> @@ -12,5 +11,6 @@ <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 kind="output" path="bin"/> </classpath> diff --git a/ddms/app/Android.mk b/ddms/app/Android.mk index 74d0f6f..757cae9 100644 --- a/ddms/app/Android.mk +++ b/ddms/app/Android.mk @@ -12,7 +12,7 @@ LOCAL_JAR_MANIFEST := etc/manifest.txt # MUST be updated as well (Except for swt.jar which is dynamically # added based on whether the VM is 32 or 64 bit) LOCAL_JAVA_LIBRARIES := \ - androidprefs \ + common \ sdkstats \ ddmlib \ ddmuilib \ diff --git a/ddms/app/etc/manifest.txt b/ddms/app/etc/manifest.txt index 3907767..82af9c9 100644 --- a/ddms/app/etc/manifest.txt +++ b/ddms/app/etc/manifest.txt @@ -1,3 +1,3 @@ Main-Class: com.android.ddms.Main -Class-Path: androidprefs.jar sdkstats.jar ddmlib.jar ddmuilib.jar swtmenubar.jar org.eclipse.jface_3.6.2.M20110210-1200.jar org.eclipse.equinox.common_3.6.0.v20100503.jar org.eclipse.core.commands_3.6.0.I20100512-1500.jar jcommon-1.0.12.jar jfreechart-1.0.9.jar jfreechart-1.0.9-swt.jar osgi.jar +Class-Path: sdkstats.jar ddmlib.jar ddmuilib.jar swtmenubar.jar org.eclipse.jface_3.6.2.M20110210-1200.jar org.eclipse.equinox.common_3.6.0.v20100503.jar org.eclipse.core.commands_3.6.0.I20100512-1500.jar jcommon-1.0.12.jar jfreechart-1.0.9.jar jfreechart-1.0.9-swt.jar osgi.jar |