From 4c22d2bb7d9d7f9cf25557a082293ddaea3aa885 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Tue, 15 Jun 2010 13:00:13 -0700 Subject: [PATCH 1/2] remove jarutils from the sdk packaging. Change-Id: Ic3c91ff5e20a5bf6b7c3ad11eb6e6f4250c7613d --- build/sdk.atree | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build/sdk.atree b/build/sdk.atree index 2b4ec7684..6da6bfc27 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -60,6 +60,7 @@ sdk/templates/java_tests_file.template platforms/${PLATFORM_NAME}/templates/java sdk/templates/layout.template platforms/${PLATFORM_NAME}/templates/layout.template sdk/templates/strings.template platforms/${PLATFORM_NAME}/templates/strings.template sdk/templates/build.template tools/lib/build.template +sdk/templates/build.export.template tools/lib/build.export.template sdk/templates/icon_ldpi.png platforms/${PLATFORM_NAME}/templates/icon_ldpi.png sdk/templates/icon_mdpi.png platforms/${PLATFORM_NAME}/templates/icon_mdpi.png sdk/templates/icon_hdpi.png platforms/${PLATFORM_NAME}/templates/icon_hdpi.png @@ -110,9 +111,6 @@ framework/dx.jar platforms/${PLATFORM_NAME}/tools/lib/dx.jar #androidprefs framework/androidprefs.jar tools/lib/androidprefs.jar -#jarutils -framework/jarutils.jar tools/lib/jarutils.jar - #apkbuilder bin/apkbuilder tools/apkbuilder framework/apkbuilder.jar tools/lib/apkbuilder.jar From 1cabf853fdff56aaf30d5f5db80f981661d53d8c Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Tue, 15 Jun 2010 18:04:44 -0700 Subject: [PATCH 2/2] remove apkbuilder.jar from the sdk build. Change-Id: I82cca5c159c1f3210b98deebfd78e2844728b2ac --- build/sdk.atree | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/sdk.atree b/build/sdk.atree index 6da6bfc27..66344d027 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -112,8 +112,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