summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2010-06-16 19:41:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-16 19:41:49 -0700
commit32b1e17b7559bb6f1892c88ff2978acabd628ffc (patch)
tree831aba2caa4a46cd1c20031c1579fee48c6b6bc5
parent66bdf7ff57c57450b30f406fdf705669da11f6da (diff)
parent2f8cb6de03df5283bc5a5e3afc6ff729804e6bc9 (diff)
downloadandroid_development-32b1e17b7559bb6f1892c88ff2978acabd628ffc.tar.gz
android_development-32b1e17b7559bb6f1892c88ff2978acabd628ffc.tar.bz2
android_development-32b1e17b7559bb6f1892c88ff2978acabd628ffc.zip
am 2f8cb6de: am fdbc1d7b: remove apkbuilder.jar from the sdk build.
Merge commit '2f8cb6de03df5283bc5a5e3afc6ff729804e6bc9' * commit '2f8cb6de03df5283bc5a5e3afc6ff729804e6bc9': remove apkbuilder.jar from the sdk build.
-rw-r--r--build/sdk.atree3
1 files changed, 1 insertions, 2 deletions
diff --git a/build/sdk.atree b/build/sdk.atree
index 0bcef09db..f6ba3004c 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -119,8 +119,7 @@ framework/dx.jar platforms/${PLATFORM_NAME}/tools/lib/dx.jar
framework/androidprefs.jar tools/lib/androidprefs.jar
#apkbuilder
-bin/apkbuilder tools/apkbuilder
-framework/apkbuilder.jar tools/lib/apkbuilder.jar
+sdk/apkbuilder/etc/apkbuilder tools/apkbuilder
# sdkstats service
framework/sdkstats.jar tools/lib/sdkstats.jar