Add Apache Http-Client library files to ADT.

This is a follow up to Change I084d78dd from prebuilt.git
to add the files required by sdklib to ADT.

Change-Id: I651ddf8f6dec480843c5bccd7d3296227b262937

3 files changed, 32 insertions, 16 deletions

diff --git a/eclipse/scripts/build_plugins.sh b/eclipse/scripts/build_plugins.sh
index 20217b9..5796a6c 100755
--- a/eclipse/scripts/build_plugins.sh
+++ b/eclipse/scripts/build_plugins.sh
@@ -239,4 +239,9 @@ if [ -n "$ECLIPSE_PID" ] && [ -f "$PID_FILE" ]; then
   kill -9 "$ECLIPSE_PID"
 fi
 
+# Remove build files left by Eclipse all behind
+rm -fv *.properties *.xml
+find . -name "@*" | xargs rm -rfv
+
+
 # we're done!
diff --git a/eclipse/scripts/build_server.sh b/eclipse/scripts/build_server.sh
index 4a6093d..275c32c 100755
--- a/eclipse/scripts/build_server.sh
+++ b/eclipse/scripts/build_server.sh
@@ -60,9 +60,13 @@ function check_params() {
 }
 
 function build_libs() {
-  MAKE_OPT="-j8"
-  echo "*** Building: make $MAKE_OPT dx ping ddms androidprefs layoutlib layoutlib_api ide_common ninepatch sdklib sdkuilib traceview"
-  make $MAKE_OPT dx ping ddms androidprefs layoutlib layoutlib_api ide_common ninepatch sdklib sdkuilib traceview
+  J="8"
+  [[ $(uname) == "Darwin" ]] && J=$(sysctl hw.ncpu | cut -d : -f 2 | tr -d ' ')
+  [[ $(uname) == "Linux"  ]] && J=$(( $(cat /proc/cpuinfo | grep processor | wc -l) + 2 ))
+  MAKE_OPT="-j$J"
+  LIBS="dx ping ddms androidprefs layoutlib layoutlib_api ide_common ninepatch sdklib sdkuilib traceview assetstudio"
+  echo "*** Building: make $MAKE_OPT $LIBS"
+  make $MAKE_OPT $LIBS
 }
 
 function build_plugin {
diff --git a/eclipse/scripts/create_adt_symlinks.sh b/eclipse/scripts/create_adt_symlinks.sh
index 5966454..72b5f6c 100755
--- a/eclipse/scripts/create_adt_symlinks.sh
+++ b/eclipse/scripts/create_adt_symlinks.sh
@@ -23,37 +23,44 @@ make -j3 showcommands $LIBS || die "ADT: Fail to build one of $LIBS."
 
 echo "Copying java libs to $DEST"
 
+# Prebuilts required by sdklib & co, to be linked/copied in the ADT libs folder
+PREBUILTS="\
+    prebuilt/common/kxml2/kxml2-2.3.0.jar \
+    prebuilt/common/commons-compress/commons-compress-1.0.jar \
+    prebuilt/common/http-client/httpclient-4.1.1.jar \
+    prebuilt/common/http-client/httpcore-4.1.jar \
+    prebuilt/common/http-client/httpmime-4.1.1.jar \
+    prebuilt/common/http-client/commons-logging-1.1.1.jar \
+    prebuilt/common/http-client/commons-codec-1.4.jar \
+    "
+
 
 HOST=`uname`
 if [ "$HOST" == "Linux" ]; then
     for LIB in $LIBS; do
         ln -svf $BACK/out/host/linux-x86/framework/$LIB.jar "$DEST/"
     done
-    ln -svf $BACK/out/host/linux-x86/framework/kxml2-2.3.0.jar          "$DEST/"
-    ln -svf $BACK/out/host/linux-x86/framework/commons-compress-1.0.jar "$DEST/"
+
+    for P in $PREBUILTS; do
+        ln -svf $BACK/$P "$DEST/"
+    done
   
 elif [ "$HOST" == "Darwin" ]; then
     for LIB in $LIBS; do
         ln -svf $BACK/out/host/darwin-x86/framework/$LIB.jar "$DEST/"
     done
-    ln -svf $BACK/out/host/darwin-x86/framework/kxml2-2.3.0.jar          "$DEST/"
-    ln -svf $BACK/out/host/darwin-x86/framework/commons-compress-1.0.jar "$DEST/"
+
+    for P in $PREBUILTS; do
+        ln -svf $BACK/$P "$DEST/"
+    done
 
 elif [ "${HOST:0:6}" == "CYGWIN" ]; then
     for LIB in $LIBS; do
         cp -vf  out/host/windows-x86/framework/$LIB.jar "$DEST/"
     done
 
-    if [ ! -f "$DEST/kxml2-2.3.0.jar" ]; then
-        cp -v "prebuilt/common/kxml2/kxml2-2.3.0.jar" "$DEST/"
-    fi
-
-    if [ ! -f "$DEST/commons-compress-1.0.jar" ]; then
-        cp -v "prebuilt/common/commons-compress/commons-compress-1.0.jar" "$DEST/"
-    fi
-
+    cp -v $PREBUILTS "$DEST/"
     chmod -v a+rx "$DEST"/*.jar
 else
     echo "Unsupported platform ($HOST). Nothing done."
 fi
-