5 files changed, 29 insertions, 15 deletions
diff --git a/eclipse/scripts/create_all_symlinks.sh b/eclipse/scripts/create_all_symlinks.sh
index dec4df7..f2ce44c 100755
--- a/eclipse/scripts/create_all_symlinks.sh
+++ b/eclipse/scripts/create_all_symlinks.sh
@@ -27,5 +27,7 @@ echo ; echo "### HIERARCHYVIEWER ###" ; echo
 $DEST/create_hierarchyviewer_symlinks.sh "$*"
 echo ; echo "### TRACEVIEW ###" ; echo
 $DEST/create_traceview_symlinks.sh "$*"
+echo ; echo "### SDKMANAGER ###" ; echo
+$DEST/create_sdkman_symlinks.sh "$*"
 
 echo "### $0 done"
diff --git a/eclipse/scripts/create_ddms_symlinks.sh b/eclipse/scripts/create_ddms_symlinks.sh
index 8791316..48f5c51 100755
--- a/eclipse/scripts/create_ddms_symlinks.sh
+++ b/eclipse/scripts/create_ddms_symlinks.sh
@@ -63,11 +63,12 @@ for i in prebuilt/common/jfreechart/*.jar; do
   cpfile $DEST $i
 done
 
-LIBS="ddmlib ddmuilib"
+COPY_LIBS="ddmlib ddmuilib"
+ALL_LIBS="$COPY_LIBS swtmenubar"
 echo "make java libs ..."
-make -j3 showcommands $LIBS || die "DDMS: Fail to build one of $LIBS."
+make -j3 showcommands $ALL_LIBS || die "DDMS: Fail to build one of $ALL_LIBS."
 
-for LIB in $LIBS; do
+for LIB in $COPY_LIBS; do
     cpfile $DEST out/host/$PLATFORM/framework/$LIB.jar
 done
 
diff --git a/eclipse/scripts/create_hierarchyviewer_symlinks.sh b/eclipse/scripts/create_hierarchyviewer_symlinks.sh
index e0439ef..47dbe7f 100755
--- a/eclipse/scripts/create_hierarchyviewer_symlinks.sh
+++ b/eclipse/scripts/create_hierarchyviewer_symlinks.sh
@@ -60,10 +60,11 @@ DEST=$BASE/libs
 
 mkdir -p $DEST
 
-LIBS="hierarchyviewerlib "
+COPY_LIBS="hierarchyviewerlib"
+ALL_LIBS="$COPY_LIBS swtmenubar"
 echo "make java libs ..."
-make -j3 showcommands $LIBS || die "Hierarchy Viewer: Fail to build one of $LIBS."
+make -j3 showcommands $ALL_LIBS || die "Hierarchy Viewer: Fail to build one of $ALL_LIBS."
 
-for LIB in $LIBS; do
+for LIB in $COPY_LIBS; do
     cpfile $DEST out/host/$PLATFORM/framework/$LIB.jar
 done
diff --git a/eclipse/scripts/create_sdkman_symlinks.sh b/eclipse/scripts/create_sdkman_symlinks.sh
new file mode 100755
index 0000000..d965195
--- /dev/null
+++ b/eclipse/scripts/create_sdkman_symlinks.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+function die() {
+    echo "Error: $*"
+    exit 1
+}
+
+set -e # fail early
+
+# CD to the top android directory
+D=`dirname "$0"`
+cd "$D/../../../"
+
+LIBS="swtmenubar"
+
+echo "SDK Manager: make java libs $LIBS"
+make -j3 showcommands $LIBS || die "SDK Manager: Failed to build one of $LIBS."
diff --git a/eclipse/scripts/update_version.sh b/eclipse/scripts/update_version.sh
index a288965..c7198af 100644..100755
--- a/eclipse/scripts/update_version.sh
+++ b/eclipse/scripts/update_version.sh
@@ -22,16 +22,10 @@ if [ `basename "$PWD"` != "eclipse" ]; then
 fi
 
 # quote dots for regexps
-OLD="${OLD//./\.}"
-NEW="${NEW//./\.}"
-
-# Find all the files with the old pattern, except changes.txt and
-# p4 edit them. Skip that if there's no p4 in path.
-if which g4 1>/dev/null 2>/dev/null ; then
-    grep -rl "$OLD" * | grep -E "\.xml$|\.MF$" | xargs -n 5 g4 edit
-fi
+OLD="${OLD//./\.}\.qualifier"
+NEW="${NEW//./\.}\.qualifier"
 
 # Now find the same files but this time use sed to replace in-place with
 # the new pattern. Old files get backuped with the .old extension.
-grep -rl "$OLD" * | grep -E "\.xml$|\.MF$" | xargs -n 1 sed -i.old "s/$OLD/$NEW/g"
+grep -rl "$OLD" * | grep -E "\.xml$|\.MF$" | xargs -n 1 sed -i -e "s/$OLD/$NEW/g"