Update sdk.atree with new ant rules location.
Change-Id: I69cd421f36c8ea2b41b3f22f053489ac7dc5e3e9
diff --git a/build/sdk.atree b/build/sdk.atree
index f21d976..2b4ec76 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -66,19 +66,15 @@
# 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
