LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 510248e2: Add Apache Commons Compress to ADT (required by sdklib)

Browse Source 
Merge commit '510248e2e138cd5990126371307df5f0dccd3c72'

* commit '510248e2e138cd5990126371307df5f0dccd3c72':
  Add Apache Commons Compress to ADT (required by sdklib)
This commit is contained in:
Xavier Ducrohet
2009-07-25 10:10:17 -07:00
committed by Android Git Automerger
parent 676902e287 510248e2e1
commit f94f24b654
5 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/eclipse/plugins/.gitignore vendored
View File

@@ -11,6 +11,7 @@ com.android.ide.eclipse.adt/ninepatch.jar
com.android.ide.eclipse.adt/sdklib.jar com.android.ide.eclipse.adt/sdklib.jar
com.android.ide.eclipse.adt/sdkstats.jar com.android.ide.eclipse.adt/sdkstats.jar
com.android.ide.eclipse.adt/sdkuilib.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/add.png
com.android.ide.eclipse.ddms/icons/backward.png com.android.ide.eclipse.ddms/icons/backward.png
com.android.ide.eclipse.ddms/icons/clear.png com.android.ide.eclipse.ddms/icons/clear.png

1
tools/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
View File

@@ -12,5 +12,6 @@
<classpathentry kind="lib" path="ninepatch.jar"/> <classpathentry kind="lib" path="ninepatch.jar"/>
<classpathentry kind="lib" path="sdklib.jar" sourcepath="/SdkLib"/> <classpathentry kind="lib" path="sdklib.jar" sourcepath="/SdkLib"/>
<classpathentry kind="lib" path="sdkuilib.jar" sourcepath="/SdkUiLib"/> <classpathentry kind="lib" path="sdkuilib.jar" sourcepath="/SdkUiLib"/>
<classpathentry kind="lib" path="commons-compress-1.0.jar"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

3
tools/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
View File

@@ -12,7 +12,8 @@ Bundle-ClassPath: .,
ninepatch.jar, ninepatch.jar,
layoutlib_utils.jar, layoutlib_utils.jar,
sdklib.jar, sdklib.jar,
sdkuilib.jar sdkuilib.jar,
commons-compress-1.0.jar
Bundle-Activator: com.android.ide.eclipse.adt.AdtPlugin Bundle-Activator: com.android.ide.eclipse.adt.AdtPlugin
Bundle-Vendor: The Android Open Source Project Bundle-Vendor: The Android Open Source Project
Require-Bundle: com.android.ide.eclipse.ddms, Require-Bundle: com.android.ide.eclipse.ddms,

3
tools/eclipse/plugins/com.android.ide.eclipse.adt/build.properties
View File

@@ -12,6 +12,7 @@ bin.includes = plugin.xml,\
layoutlib_utils.jar,\ layoutlib_utils.jar,\
ninepatch.jar,\ ninepatch.jar,\
sdklib.jar,\ sdklib.jar,\
sdkuilib.jar sdkuilib.jar,\
commons-compress-1.0.jar
source.. = src/ source.. = src/
output.. = bin/ output.. = bin/

6
tools/eclipse/scripts/create_adt_symlinks.sh
View File

@@ -27,12 +27,14 @@ if [ "$HOST" == "Linux" ]; then
ln -svf $BACK/out/host/linux-x86/framework/$LIB.jar "$DEST/" ln -svf $BACK/out/host/linux-x86/framework/$LIB.jar "$DEST/"
done done
ln -svf $BACK/out/host/linux-x86/framework/kxml2-2.3.0.jar "$DEST/" 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 elif [ "$HOST" == "Darwin" ]; then
for LIB in $LIBS; do for LIB in $LIBS; do
ln -svf $BACK/out/host/darwin-x86/framework/$LIB.jar "$DEST/" ln -svf $BACK/out/host/darwin-x86/framework/$LIB.jar "$DEST/"
done done
ln -svf $BACK/out/host/darwin-x86/framework/kxml2-2.3.0.jar "$DEST/" 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 elif [ "${HOST:0:6}" == "CYGWIN" ]; then
for LIB in $LIBS; do 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/" cp -v "prebuilt/common/kxml2/kxml2-2.3.0.jar" "$DEST/"
fi 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 chmod -v a+rx "$DEST"/*.jar
else else
echo "Unsupported platform ($HOST). Nothing done." echo "Unsupported platform ($HOST). Nothing done."