More refactoring.

Move stuff out of sdklib into common and ide_common.
Remove androidprefs and move the one class into common.

Change-Id: I71d126a13cf2ba413692e29616f4968a37d7b33a

7 files changed, 6 insertions, 8 deletions

diff --git a/sdkmanager/app/.classpath b/sdkmanager/app/.classpath
index acc6bfa..939e088 100644
--- a/sdkmanager/app/.classpath
+++ b/sdkmanager/app/.classpath
@@ -4,7 +4,6 @@
 	<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"/>
diff --git a/sdkmanager/app/Android.mk b/sdkmanager/app/Android.mk
index 6431695..752c8e8 100644
--- a/sdkmanager/app/Android.mk
+++ b/sdkmanager/app/Android.mk
@@ -16,7 +16,7 @@ LOCAL_JAR_MANIFEST := etc/manifest.txt
 #  it is dynamically added by android.bat/.sh based on whether the
 #  current VM is 32 or 64 bit.)
 LOCAL_JAVA_LIBRARIES := \
-	androidprefs \
+	common \
 	sdklib \
 	sdkuilib \
 	swt \
diff --git a/sdkmanager/app/etc/android.bat b/sdkmanager/app/etc/android.bat
index f48b80c..2932783 100755
--- a/sdkmanager/app/etc/android.bat
+++ b/sdkmanager/app/etc/android.bat
@@ -48,7 +48,6 @@ for /f %%a in ('%java_exe% -jar lib\archquery.jar') do set swt_path=lib\%%a
 

     set tmp_dir=%TEMP%\temp-android-tool

     xcopy %swt_path% %tmp_dir%\%swt_path% /I /E /C /G /R /Y /Q > nul

-    copy /B /D /Y lib\androidprefs.jar   %tmp_dir%\lib\        > nul

     copy /B /D /Y lib\org.eclipse.*      %tmp_dir%\lib\        > nul

     copy /B /D /Y lib\sdk*               %tmp_dir%\lib\        > nul

     copy /B /D /Y lib\common.jar         %tmp_dir%\lib\        > nul

diff --git a/sdkmanager/app/etc/manifest.txt b/sdkmanager/app/etc/manifest.txt
index 12d22e5..50e1285 100644
--- a/sdkmanager/app/etc/manifest.txt
+++ b/sdkmanager/app/etc/manifest.txt
@@ -1,2 +1,2 @@
 Main-Class: com.android.sdkmanager.Main
-Class-Path: androidprefs.jar common.jar sdklib.jar sdkuilib.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
+Class-Path: common.jar sdklib.jar sdkuilib.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
diff --git a/sdkmanager/app/src/com/android/sdkmanager/Main.java b/sdkmanager/app/src/com/android/sdkmanager/Main.java
index 8d945d7..2592ecd 100644
--- a/sdkmanager/app/src/com/android/sdkmanager/Main.java
+++ b/sdkmanager/app/src/com/android/sdkmanager/Main.java
@@ -16,6 +16,7 @@
 
 package com.android.sdkmanager;
 
+import com.android.SdkConstants;
 import com.android.annotations.VisibleForTesting;
 import com.android.annotations.VisibleForTesting.Visibility;
 import com.android.io.FileWrapper;
@@ -25,7 +26,6 @@ import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.IAndroidTarget.IOptionalLibrary;
 import com.android.sdklib.ISdkLog;
 import com.android.sdklib.ISystemImage;
-import com.android.sdklib.SdkConstants;
 import com.android.sdklib.SdkManager;
 import com.android.sdklib.internal.avd.AvdInfo;
 import com.android.sdklib.internal.avd.AvdManager;
@@ -42,7 +42,6 @@ import com.android.sdklib.internal.repository.packages.PlatformToolPackage;
 import com.android.sdklib.internal.repository.packages.ToolPackage;
 import com.android.sdklib.repository.SdkAddonConstants;
 import com.android.sdklib.repository.SdkRepoConstants;
-import com.android.sdklib.xml.AndroidXPathFactory;
 import com.android.sdkuilib.internal.repository.SdkUpdaterNoWindow;
 import com.android.sdkuilib.internal.widgets.MessageBoxLog;
 import com.android.sdkuilib.repository.AvdManagerWindow;
@@ -50,6 +49,7 @@ import com.android.sdkuilib.repository.AvdManagerWindow.AvdInvocationContext;
 import com.android.sdkuilib.repository.SdkUpdaterWindow;
 import com.android.sdkuilib.repository.SdkUpdaterWindow.SdkInvocationContext;
 import com.android.utils.Pair;
+import com.android.xml.AndroidXPathFactory;
 
 import org.eclipse.swt.widgets.Display;
 import org.xml.sax.InputSource;
diff --git a/sdkmanager/app/tests/com/android/sdkmanager/AvdManagerTest.java b/sdkmanager/app/tests/com/android/sdkmanager/AvdManagerTest.java
index 93b12c1..a376490 100644
--- a/sdkmanager/app/tests/com/android/sdkmanager/AvdManagerTest.java
+++ b/sdkmanager/app/tests/com/android/sdkmanager/AvdManagerTest.java
@@ -16,9 +16,9 @@
 
 package com.android.sdkmanager;
 
+import com.android.SdkConstants;
 import com.android.io.FileWrapper;
 import com.android.sdklib.IAndroidTarget;
-import com.android.sdklib.SdkConstants;
 import com.android.sdklib.SdkManagerTestCase;
 import com.android.sdklib.internal.avd.AvdInfo;
 import com.android.sdklib.internal.project.ProjectProperties;
diff --git a/sdkmanager/app/tests/com/android/sdkmanager/MainTest.java b/sdkmanager/app/tests/com/android/sdkmanager/MainTest.java
index 2e5aafd..10d7576 100644
--- a/sdkmanager/app/tests/com/android/sdkmanager/MainTest.java
+++ b/sdkmanager/app/tests/com/android/sdkmanager/MainTest.java
@@ -17,8 +17,8 @@
 package com.android.sdkmanager;
 
 
+import com.android.SdkConstants;
 import com.android.sdklib.IAndroidTarget;
-import com.android.sdklib.SdkConstants;
 import com.android.sdklib.SdkManagerTestCase;
 import com.android.sdklib.internal.avd.AvdInfo;
 import com.android.sdklib.repository.SdkAddonConstants;