Rename project libraries.

Change-Id: I324a5cb5c9c34ec4a8c2e4438bba8ebd56a693e6

8 files changed, 28 insertions, 28 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
index c035541..a0396bc 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
@@ -4,14 +4,14 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="libs/ninepatch.jar" sourcepath="/ninepatch"/>
-	<classpathentry exported="true" kind="lib" path="libs/sdkuilib.jar" sourcepath="/SdkUiLib"/>
-	<classpathentry exported="true" kind="lib" path="libs/rule_api.jar" sourcepath="/rule_api"/>
-	<classpathentry exported="true" kind="lib" path="libs/lint_api.jar" sourcepath="/lint-api"/>
-	<classpathentry exported="true" kind="lib" path="libs/lint_checks.jar" sourcepath="/lint-checks"/>
-	<classpathentry exported="true" kind="lib" path="libs/assetstudio.jar" sourcepath="/assetstudio"/>
+	<classpathentry exported="true" kind="lib" path="libs/sdkuilib.jar" sourcepath="/sdkuilib"/>
+	<classpathentry exported="true" kind="lib" path="libs/rule-api.jar" sourcepath="/rule-api"/>
+	<classpathentry exported="true" kind="lib" path="libs/lint-api.jar" sourcepath="/lint-api"/>
+	<classpathentry exported="true" kind="lib" path="libs/lint-checks.jar" sourcepath="/lint-checks"/>
+	<classpathentry exported="true" kind="lib" path="libs/asset-studio.jar" sourcepath="/asset-studio"/>
 	<classpathentry exported="true" kind="lib" path="libs/ant-glob.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/freemarker-2.3.19.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/manifmerger.jar" sourcepath="/ManifestMerger"/>
+	<classpathentry exported="true" kind="lib" path="libs/manifest-merger.jar" sourcepath="/ManifestMerger"/>
 	<classpathentry kind="var" path="ANDROID_SRC/sdk/eclipse/plugins/com.android.ide.eclipse.adt/libs/propertysheet.jar" sourcepath="/ANDROID_SRC/external/eclipse-windowbuilder/propertysheet/src"/>
 	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src.zip"/>
 	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-tree-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src.zip"/>
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 7cdb400..4fa9be2 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
@@ -7,10 +7,10 @@ Bundle-ClassPath: .,
  libs/sdkuilib.jar,
  libs/ninepatch.jar,
  libs/freemarker-2.3.19.jar,
- libs/rule_api.jar,
- libs/assetstudio.jar,
- libs/lint_api.jar,
- libs/lint_checks.jar,
+ libs/rule-api.jar,
+ libs/asset-studio.jar,
+ libs/lint-api.jar,
+ libs/lint-checks.jar,
  libs/lombok-ast-0.2.jar,
  libs/asm-4.0.jar,
  libs/asm-tree-4.0.jar,
@@ -18,7 +18,7 @@ Bundle-ClassPath: .,
  libs/propertysheet.jar,
  libs/ant-glob.jar,
  libs/swtmenubar.jar,
- libs/manifmerger.jar
+ libs/manifest-merger.jar
 Bundle-Activator: com.android.ide.eclipse.adt.AdtPlugin
 Bundle-Vendor: The Android Open Source Project
 Require-Bundle: com.android.ide.eclipse.base,
diff --git a/eclipse/plugins/com.android.ide.eclipse.base/.classpath b/eclipse/plugins/com.android.ide.eclipse.base/.classpath
index d9db63a..adeb83c 100644
--- a/eclipse/plugins/com.android.ide.eclipse.base/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.base/.classpath
@@ -10,10 +10,10 @@
 	<classpathentry exported="true" kind="lib" path="libs/httpcore-4.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/httpmime-4.1.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/kxml2-2.3.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/layoutlib_api.jar" sourcepath="/layoutlib_api"/>
-	<classpathentry exported="true" kind="lib" path="libs/sdklib.jar" sourcepath="/SdkLib"/>
-	<classpathentry exported="true" kind="lib" path="libs/sdkstats.jar" sourcepath="SdkStatsService"/>
-	<classpathentry exported="true" kind="lib" path="libs/sdk_common.jar" sourcepath="/sdk_common"/>
+	<classpathentry exported="true" kind="lib" path="libs/layoutlib-api.jar" sourcepath="/layoutlib-api"/>
+	<classpathentry exported="true" kind="lib" path="libs/sdklib.jar" sourcepath="/sdklib"/>
+	<classpathentry exported="true" kind="lib" path="libs/sdkstats.jar" sourcepath="/sdkstats"/>
+	<classpathentry exported="true" kind="lib" path="libs/sdk-common.jar" sourcepath="/sdk-common"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
diff --git a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF
index 874c942..6cacbc9 100644
--- a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF
@@ -17,11 +17,11 @@ Bundle-ClassPath: .,
  libs/httpcore-4.1.jar,
  libs/httpmime-4.1.1.jar,
  libs/kxml2-2.3.0.jar,
- libs/layoutlib_api.jar,
+ libs/layoutlib-api.jar,
  libs/sdklib.jar,
  libs/sdkstats.jar,
  libs/dvlib.jar,
- libs/sdk_common.jar
+ libs/sdk-common.jar
 Export-Package: com.android,
  com.android.annotations,
  com.android.dvlib,
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
index ab36b62..5202252 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
@@ -10,15 +10,15 @@
 	<classpathentry kind="lib" path="/plugin-adt/libs/ninepatch.jar" sourcepath="/ninepatch"/>
 	<classpathentry kind="lib" path="/plugin-base/libs/sdklib.jar" sourcepath="/SdkLib"/>
 	<classpathentry kind="lib" path="/plugin-adt/libs/sdkuilib.jar" sourcepath="/SdkUiLib"/>
-	<classpathentry kind="lib" path="/plugin-adt/libs/rule_api.jar" sourcepath="/rule_api"/>
+	<classpathentry kind="lib" path="/plugin-adt/libs/rule-api.jar" sourcepath="/rule-api"/>
 	<classpathentry kind="lib" path="/plugin-base/libs/common.jar" sourcepath="/common"/>
-	<classpathentry kind="lib" path="/plugin-adt/libs/lint_api.jar" sourcepath="/lint-api"/>
-	<classpathentry kind="lib" path="/plugin-adt/libs/lint_checks.jar" sourcepath="/lint-checks"/>
-	<classpathentry kind="lib" path="/plugin-base/libs/sdk_common.jar"/>
+	<classpathentry kind="lib" path="/plugin-adt/libs/lint-api.jar" sourcepath="/lint-api"/>
+	<classpathentry kind="lib" path="/plugin-adt/libs/lint-checks.jar" sourcepath="/lint-checks"/>
+	<classpathentry kind="lib" path="/plugin-base/libs/sdk-common.jar"/>
 	<classpathentry kind="lib" path="/plugin-adt/libs/lombok-ast-0.2.jar"/>
 	<classpathentry kind="lib" path="/plugin-adt/libs/asm-4.0.jar"/>
 	<classpathentry kind="lib" path="/plugin-adt/libs/asm-analysis-4.0.jar"/>
 	<classpathentry kind="lib" path="/plugin-adt/libs/asm-tree-4.0.jar"/>
-	<classpathentry kind="lib" path="/plugin-adt/libs/manifmerger.jar" sourcepath="/ManifestMerger"/>
+	<classpathentry kind="lib" path="/plugin-adt/libs/manifest-merger.jar" sourcepath="/manifest-merger"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF
index 3abef40..8695eb2 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF
@@ -11,6 +11,6 @@ Bundle-ClassPath: kxml2-2.3.0.jar,
  .,
  sdktestutils.jar,
  layoutlib.jar,
- lint_api.jar,
- lint_checks.jar,
+ lint-api.jar,
+ lint-checks.jar,
  easymock.jar
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/build.properties b/eclipse/plugins/com.android.ide.eclipse.tests/build.properties
index 436573e..27e32c2 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/build.properties
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/build.properties
@@ -9,8 +9,8 @@ bin.includes = META-INF/,\
                kxml2-2.3.0.jar,\
                sdktestutils.jar,\
                layoutlib.jar,\
-               lint_api.jar,
-               lint_checks.jar,
+               lint-api.jar,\
+               lint-checks.jar,\
                unittests/com/android/sdklib/testdata/,\
                unittests/com/android/layoutlib/testdata/,\
                unittests/com/android/ide/eclipse/testdata/,\
diff --git a/eclipse/scripts/create_all_symlinks.sh b/eclipse/scripts/create_all_symlinks.sh
index 281159d..7bc5d38 100755
--- a/eclipse/scripts/create_all_symlinks.sh
+++ b/eclipse/scripts/create_all_symlinks.sh
@@ -109,7 +109,7 @@ CP_FILES=""
 ### BASE ###
 
 BASE_PLUGIN_DEST="sdk/eclipse/plugins/com.android.ide.eclipse.base/libs"
-BASE_PLUGIN_LIBS="common sdkstats sdklib dvlib layoutlib_api sdk_common"
+BASE_PLUGIN_LIBS="common sdkstats sdklib dvlib layoutlib-api sdk-common"
 BASE_PLUGIN_PREBUILTS="\
     prebuilts/misc/common/kxml2/kxml2-2.3.0.jar \
     prebuilts/tools/common/commons-compress/commons-compress-1.0.jar \
@@ -127,7 +127,7 @@ CP_FILES="$CP_FILES @:$BASE_PLUGIN_DEST $BASE_PLUGIN_LIBS $BASE_PLUGIN_PREBUILTS
 ### ADT ###
 
 ADT_DEST="sdk/eclipse/plugins/com.android.ide.eclipse.adt/libs"
-ADT_LIBS="ant-glob assetstudio lint_api lint_checks ninepatch propertysheet rule_api sdkuilib swtmenubar manifmerger"
+ADT_LIBS="ant-glob asset-studio lint-api lint-checks ninepatch propertysheet rule-api sdkuilib swtmenubar manifest-merger"
 ADT_PREBUILTS="\
     prebuilts/tools/common/freemarker/freemarker-2.3.19.jar \
     prebuilts/tools/common/asm-tools/asm-4.0.jar \