20 files changed, 9 insertions, 10 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
index e04a925..59c0102 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
@@ -7,7 +7,7 @@
 	<classpathentry kind="lib" path="libs/commons-compress-1.0.jar"/>
 	<classpathentry kind="lib" path="libs/kxml2-2.3.0.jar"/>
 	<classpathentry kind="lib" path="libs/layoutlib_api.jar"/>
-	<classpathentry kind="lib" path="libs/layoutlib_utils.jar" sourcepath="/layoutlib_utils"/>
+	<classpathentry kind="lib" path="libs/ide_common.jar" sourcepath="/ide_common"/>
 	<classpathentry kind="lib" path="libs/ninepatch.jar"/>
 	<classpathentry kind="lib" path="libs/sdklib.jar" sourcepath="/SdkLib"/>
 	<classpathentry kind="lib" path="libs/sdkstats.jar" sourcepath="/SdkStatsService"/>
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
index 0ce3d3d..6445f60 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Bundle-ClassPath: .,
  libs/commons-compress-1.0.jar,
  libs/kxml2-2.3.0.jar,
  libs/layoutlib_api.jar,
- libs/layoutlib_utils.jar
+ libs/ide_common.jar
 Bundle-Activator: com.android.ide.eclipse.adt.AdtPlugin
 Bundle-Vendor: The Android Open Source Project
 Require-Bundle: com.android.ide.eclipse.ddms,
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.java
index fd1a31e..8e79d92 100755
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.java
@@ -48,7 +48,6 @@ import com.android.ide.eclipse.adt.internal.sdk.Sdk.ITargetChangeListener;
 import com.android.ide.eclipse.adt.io.IFileWrapper;
 import com.android.layoutlib.api.ILayoutLog;
 import com.android.layoutlib.api.IResourceValue;
-import com.android.layoutlib.api.LayoutBridge;
 import com.android.layoutlib.api.LayoutScene;
 import com.android.layoutlib.api.SceneParams;
 import com.android.layoutlib.api.SceneResult;
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
index 0702e99..ccb2cae 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
@@ -7,10 +7,10 @@
 	<classpathentry kind="lib" path="layoutlib.jar"/>
 	<classpathentry kind="lib" path="kxml2-2.3.0.jar"/>
 	<classpathentry kind="lib" path="easymock.jar"/>
-	<classpathentry kind="lib" path="layoutlib_utils.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/ddmuilib"/>
 	<classpathentry kind="lib" path="/adt/libs/layoutlib_api.jar" sourcepath="/layoutlib_api"/>
+	<classpathentry kind="lib" path="/adt/libs/ide_common.jar" sourcepath="/ide_common"/>
 	<classpathentry kind="lib" path="/adt/libs/ninepatch.jar"/>
 	<classpathentry kind="lib" path="/adt/libs/sdklib.jar" sourcepath="/SdkLib"/>
 	<classpathentry kind="lib" path="/adt/libs/sdkuilib.jar" sourcepath="/SdkUiLib"/>
diff --git a/eclipse/scripts/build_server.sh b/eclipse/scripts/build_server.sh
index 12e4472..4e88697 100755
--- a/eclipse/scripts/build_server.sh
+++ b/eclipse/scripts/build_server.sh
@@ -61,8 +61,8 @@ function check_params() {
 
 function build_libs() {
   MAKE_OPT="-j8"
-  echo "*** Building: make $MAKE_OPT dx ping ddms androidprefs layoutlib layoutlib_api layoutlib_utils ninepatch sdklib sdkuilib"
-  make $MAKE_OPT dx ping ddms androidprefs layoutlib layoutlib_api layoutlib_utils ninepatch sdklib sdkuilib
+  echo "*** Building: make $MAKE_OPT dx ping ddms androidprefs layoutlib layoutlib_api ide_common ninepatch sdklib sdkuilib"
+  make $MAKE_OPT dx ping ddms androidprefs layoutlib layoutlib_api ide_common ninepatch sdklib sdkuilib
 }
 
 function build_plugin {
diff --git a/eclipse/scripts/create_adt_symlinks.sh b/eclipse/scripts/create_adt_symlinks.sh
index fef0761..dd8cb77 100755
--- a/eclipse/scripts/create_adt_symlinks.sh
+++ b/eclipse/scripts/create_adt_symlinks.sh
@@ -16,7 +16,7 @@ BACK=`echo $DEST | sed 's@[^/]*@..@g'`
 
 mkdir -p $DEST
 
-LIBS="sdkstats androidprefs layoutlib_api layoutlib_utils ninepatch sdklib sdkuilib"
+LIBS="sdkstats androidprefs layoutlib_api ide_common ninepatch sdklib sdkuilib"
 
 echo "make java libs ..."
 make -j3 showcommands $LIBS || die "ADT: Fail to build one of $LIBS."
diff --git a/eclipse/scripts/create_test_symlinks.sh b/eclipse/scripts/create_test_symlinks.sh
index 17f2707..dca9bf3 100755
--- a/eclipse/scripts/create_test_symlinks.sh
+++ b/eclipse/scripts/create_test_symlinks.sh
@@ -35,7 +35,7 @@ BASE="sdk/eclipse/plugins/com.android.ide.eclipse.tests"
 DEST=$BASE
 BACK=`back $DEST`
 
-LIBS="easymock layoutlib_utils"
+LIBS="easymock"
 
 echo "make java libs ..."
 make -j3 showcommands $LIBS || die "ADT: Fail to build one of $LIBS."
diff --git a/layoutlib_utils/.classpath b/ide_common/.classpath
index 0321c43..0321c43 100644
--- a/layoutlib_utils/.classpath
+++ b/ide_common/.classpath
diff --git a/layoutlib_utils/.gitignore b/ide_common/.gitignore
index fe99505..fe99505 100644
--- a/layoutlib_utils/.gitignore
+++ b/ide_common/.gitignore
diff --git a/layoutlib_utils/.project b/ide_common/.project
index b427809..83e105b 100644
--- a/layoutlib_utils/.project
+++ b/ide_common/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>layoutlib_utils</name>
+	<name>ide_common</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/layoutlib_utils/Android.mk b/ide_common/Android.mk
index 50eb0ff..e1b3cf5 100644
--- a/layoutlib_utils/Android.mk
+++ b/ide_common/Android.mk
@@ -21,6 +21,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under,src)
 LOCAL_JAVA_LIBRARIES := \
 	layoutlib_api
 
-LOCAL_MODULE := layoutlib_utils
+LOCAL_MODULE := ide_common
 
 include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/layoutlib_utils/src/com/android/ide/common/layoutlib/BasicLayoutScene.java b/ide_common/src/com/android/ide/common/layoutlib/BasicLayoutScene.java
index dfb3992..dfb3992 100644
--- a/layoutlib_utils/src/com/android/ide/common/layoutlib/BasicLayoutScene.java
+++ b/ide_common/src/com/android/ide/common/layoutlib/BasicLayoutScene.java
diff --git a/layoutlib_utils/src/com/android/ide/common/layoutlib/DensityBasedResourceValue.java b/ide_common/src/com/android/ide/common/layoutlib/DensityBasedResourceValue.java
index e1c0caa..e1c0caa 100644
--- a/layoutlib_utils/src/com/android/ide/common/layoutlib/DensityBasedResourceValue.java
+++ b/ide_common/src/com/android/ide/common/layoutlib/DensityBasedResourceValue.java
diff --git a/layoutlib_utils/src/com/android/ide/common/layoutlib/LayoutBridgeWrapper.java b/ide_common/src/com/android/ide/common/layoutlib/LayoutBridgeWrapper.java
index f4c99bd..f4c99bd 100644
--- a/layoutlib_utils/src/com/android/ide/common/layoutlib/LayoutBridgeWrapper.java
+++ b/ide_common/src/com/android/ide/common/layoutlib/LayoutBridgeWrapper.java
diff --git a/layoutlib_utils/src/com/android/ide/common/layoutlib/LayoutLibrary.java b/ide_common/src/com/android/ide/common/layoutlib/LayoutLibrary.java
index 5ec7ae5..5ec7ae5 100644
--- a/layoutlib_utils/src/com/android/ide/common/layoutlib/LayoutLibrary.java
+++ b/ide_common/src/com/android/ide/common/layoutlib/LayoutLibrary.java
diff --git a/layoutlib_utils/src/com/android/ide/common/layoutlib/ResourceValue.java b/ide_common/src/com/android/ide/common/layoutlib/ResourceValue.java
index 382d961..382d961 100644
--- a/layoutlib_utils/src/com/android/ide/common/layoutlib/ResourceValue.java
+++ b/ide_common/src/com/android/ide/common/layoutlib/ResourceValue.java
diff --git a/layoutlib_utils/src/com/android/ide/common/layoutlib/StyleResourceValue.java b/ide_common/src/com/android/ide/common/layoutlib/StyleResourceValue.java
index 721b16c..721b16c 100644
--- a/layoutlib_utils/src/com/android/ide/common/layoutlib/StyleResourceValue.java
+++ b/ide_common/src/com/android/ide/common/layoutlib/StyleResourceValue.java
diff --git a/layoutlib_utils/src/com/android/ide/common/layoutlib/ValueResourceParser.java b/ide_common/src/com/android/ide/common/layoutlib/ValueResourceParser.java
index c784f1f..c784f1f 100644
--- a/layoutlib_utils/src/com/android/ide/common/layoutlib/ValueResourceParser.java
+++ b/ide_common/src/com/android/ide/common/layoutlib/ValueResourceParser.java
diff --git a/layoutlib_utils/src/com/android/ide/common/log/ILogger.java b/ide_common/src/com/android/ide/common/log/ILogger.java
index 1ad602e..1ad602e 100644
--- a/layoutlib_utils/src/com/android/ide/common/log/ILogger.java
+++ b/ide_common/src/com/android/ide/common/log/ILogger.java
diff --git a/layoutlib_utils/src/com/android/ide/common/sdk/LoadStatus.java b/ide_common/src/com/android/ide/common/sdk/LoadStatus.java
index babbd63..babbd63 100644
--- a/layoutlib_utils/src/com/android/ide/common/sdk/LoadStatus.java
+++ b/ide_common/src/com/android/ide/common/sdk/LoadStatus.java