Misc fix in HierarchyViewer plugin.

- Add plug-in to the update sites
- Remove ddm(ui)lib from the plugin as it accesses the ddms plug-in

Change-Id: I524180688443e0a72443a04fc3f00300e8ddc165

5 files changed, 10 insertions, 6 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/.classpath b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/.classpath
index 90a300d..439f785 100644
--- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="lib" path="libs/hierarchyviewerlib.jar" sourcepath="/hierarchyviewerlib"/>
-	<classpathentry kind="lib" path="libs/ddmlib.jar" sourcepath="/ddmlib"/>
-	<classpathentry kind="lib" path="libs/ddmuilib.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ddmuilib"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF
index 6458f58..a4acf87 100644
--- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF
@@ -12,7 +12,5 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.console,
  com.android.ide.eclipse.ddms
 Bundle-ClassPath: .,
- libs/hierarchyviewerlib.jar,
- libs/ddmlib.jar,
- libs/ddmuilib.jar
+ libs/hierarchyviewerlib.jar
 Export-Package: com.android.ide.eclipse.hierarchyviewer
diff --git a/eclipse/scripts/create_hierarchyviewer_symlinks.sh b/eclipse/scripts/create_hierarchyviewer_symlinks.sh
index f341144..e0439ef 100755
--- a/eclipse/scripts/create_hierarchyviewer_symlinks.sh
+++ b/eclipse/scripts/create_hierarchyviewer_symlinks.sh
@@ -60,7 +60,7 @@ DEST=$BASE/libs
 
 mkdir -p $DEST
 
-LIBS="ddmlib ddmuilib hierarchyviewerlib "
+LIBS="hierarchyviewerlib "
 echo "make java libs ..."
 make -j3 showcommands $LIBS || die "Hierarchy Viewer: Fail to build one of $LIBS."
 
diff --git a/eclipse/sites/external/site.xml b/eclipse/sites/external/site.xml
index fc15b3a..40b608f 100644
--- a/eclipse/sites/external/site.xml
+++ b/eclipse/sites/external/site.xml
@@ -9,6 +9,9 @@
    <feature url="features/com.android.ide.eclipse.ddms_0.9.8.qualifier.jar" id="com.android.ide.eclipse.ddms" version="0.9.8.qualifier">
       <category name="developer"/>
    </feature>
+   <feature url="features/com.android.ide.eclipse.hierarchyviewer_0.9.8.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="0.9.8.qualifier">
+      <category name="developer"/>
+   </feature>
    <category-def name="developer" label="Developer Tools">
       <description>
          Features that add Android support to Eclipse for application developers.
diff --git a/eclipse/sites/internal/site.xml b/eclipse/sites/internal/site.xml
index df2e13b..f649a4a 100644
--- a/eclipse/sites/internal/site.xml
+++ b/eclipse/sites/internal/site.xml
@@ -9,6 +9,9 @@
    <feature url="features/com.android.ide.eclipse.ddms_0.9.8.qualifier.jar" id="com.android.ide.eclipse.ddms" version="0.9.8.qualifier">
       <category name="developer"/>
    </feature>
+   <feature url="features/com.android.ide.eclipse.hierarchyviewer_0.9.8.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="0.9.8.qualifier">
+      <category name="developer"/>
+   </feature>
    <feature url="features/com.android.ide.eclipse.tests_0.9.8.qualifier.jar" id="com.android.ide.eclipse.tests" version="0.9.8.qualifier">
       <category name="test"/>
    </feature>