From 510248e2e138cd5990126371307df5f0dccd3c72 Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Fri, 24 Jul 2009 17:17:38 -0700
Subject: [PATCH] Add Apache Commons Compress to ADT (required by sdklib)

---
 tools/eclipse/plugins/.gitignore                                    | 1 +
 tools/eclipse/plugins/com.android.ide.eclipse.adt/.classpath        | 1 +
 .../plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF        | 3 ++-
 tools/eclipse/plugins/com.android.ide.eclipse.adt/build.properties  | 3 ++-
 tools/eclipse/scripts/create_adt_symlinks.sh                        | 6 ++++++
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/tools/eclipse/plugins/.gitignore b/tools/eclipse/plugins/.gitignore
index 2842bb13..63ac0cf1 100644
--- a/tools/eclipse/plugins/.gitignore
+++ b/tools/eclipse/plugins/.gitignore
@@ -11,6 +11,7 @@ com.android.ide.eclipse.adt/ninepatch.jar
 com.android.ide.eclipse.adt/sdklib.jar
 com.android.ide.eclipse.adt/sdkstats.jar
 com.android.ide.eclipse.adt/sdkuilib.jar
+com.android.ide.eclipse.adt/commons-compress-1.0.jar
 com.android.ide.eclipse.ddms/icons/add.png
 com.android.ide.eclipse.ddms/icons/backward.png
 com.android.ide.eclipse.ddms/icons/clear.png
diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/.classpath b/tools/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
index 9898b97e..7474b702 100644
--- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
+++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
@@ -12,5 +12,6 @@
 	<classpathentry kind="lib" path="ninepatch.jar"/>
 	<classpathentry kind="lib" path="sdklib.jar" sourcepath="/SdkLib"/>
 	<classpathentry kind="lib" path="sdkuilib.jar" sourcepath="/SdkUiLib"/>
+	<classpathentry kind="lib" path="commons-compress-1.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF b/tools/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
index fc499023..f9c1e9c1 100644
--- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
+++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
@@ -12,7 +12,8 @@ Bundle-ClassPath: .,
  ninepatch.jar,
  layoutlib_utils.jar,
  sdklib.jar,
- sdkuilib.jar
+ sdkuilib.jar,
+ commons-compress-1.0.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/tools/eclipse/plugins/com.android.ide.eclipse.adt/build.properties b/tools/eclipse/plugins/com.android.ide.eclipse.adt/build.properties
index c7eb7494..af6383bb 100644
--- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/build.properties
+++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/build.properties
@@ -12,6 +12,7 @@ bin.includes = plugin.xml,\
                layoutlib_utils.jar,\
                ninepatch.jar,\
                sdklib.jar,\
-               sdkuilib.jar
+               sdkuilib.jar,\
+               commons-compress-1.0.jar
 source.. = src/
 output.. = bin/
diff --git a/tools/eclipse/scripts/create_adt_symlinks.sh b/tools/eclipse/scripts/create_adt_symlinks.sh
index 557c4d96..1ceb192b 100755
--- a/tools/eclipse/scripts/create_adt_symlinks.sh
+++ b/tools/eclipse/scripts/create_adt_symlinks.sh
@@ -27,12 +27,14 @@ if [ "$HOST" == "Linux" ]; then
         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/"
   
 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/"
 
 elif [ "${HOST:0:6}" == "CYGWIN" ]; then
     for LIB in $LIBS; do
@@ -43,6 +45,10 @@ elif [ "${HOST:0:6}" == "CYGWIN" ]; 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
+
     chmod -v a+rx "$DEST"/*.jar
 else
     echo "Unsupported platform ($HOST). Nothing done."
-- 
2.11.0