From 36cb47e677f0974e757e79346942760797f45b39 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Wed, 5 May 2010 14:13:49 -0700 Subject: [PATCH] Update sdk.atree with new ant rules location. Change-Id: I69cd421f36c8ea2b41b3f22f053489ac7dc5e3e9 --- build/sdk.atree | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/build/sdk.atree b/build/sdk.atree index f21d976bc..2b4ec7684 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -66,19 +66,15 @@ sdk/templates/icon_hdpi.png platforms/${PLATFORM_NAME}/templates/icon_hdpi.png # sdk.git files # SDK properties -sdk/files/sdk.properties platforms/${PLATFORM_NAME}/sdk.properties -# legacy Ant build rules, copied under the old name -sdk/files/ant_rules_r1.xml platforms/${PLATFORM_NAME}/templates/android_rules.xml -sdk/files/ant_test_rules_r1.xml platforms/${PLATFORM_NAME}/templates/android_test_rules.xml -# newer Ant rules. -sdk/files/ant_rules_r3.xml platforms/${PLATFORM_NAME}/ant/ant_rules_r3.xml -sdk/files/ant_test_rules_r3.xml platforms/${PLATFORM_NAME}/ant/ant_test_rules_r3.xml -sdk/files/ant_lib_rules_r3.xml platforms/${PLATFORM_NAME}/ant/ant_lib_rules_r3.xml -sdk/files/ant_rules_r2.xml platforms/${PLATFORM_NAME}/ant/ant_rules_r2.xml -sdk/files/ant_test_rules_r2.xml platforms/${PLATFORM_NAME}/ant/ant_test_rules_r2.xml -sdk/files/ant_lib_rules_r2.xml platforms/${PLATFORM_NAME}/ant/ant_lib_rules_r2.xml +sdk/files/sdk.properties platforms/${PLATFORM_NAME}/sdk.properties +# copy the Ant rules to the platforms and to the tools. +sdk/files/ant platforms/${PLATFORM_NAME}/ant +sdk/files/ant tools/ant +# also copy the rev1 under the old name/location for legacy reason +sdk/files/ant/ant_rules_r1.xml platforms/${PLATFORM_NAME}/templates/android_rules.xml +sdk/files/ant/ant_test_rules_r1.xml platforms/${PLATFORM_NAME}/templates/android_test_rules.xml # layout device definition -sdk/files/devices.xml tools/lib/devices.xml +sdk/files/devices.xml tools/lib/devices.xml # emacs support from sdk.git sdk/files/android.el tools/lib/android.el