Fix SDK build by packaging the new Ant rules files.

Change-Id: Id88eeb0e596b58e48f425c7521fb40f9e046b818

diff --git a/build/sdk.atree b/build/sdk.atree
index a9226ce..f8d4cb4 100644 (file)
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -65,9 +65,17 @@ sdk/templates/icon_mdpi.png platforms/${PLATFORM_NAME}/templates/icon_mdpi.png
 sdk/templates/icon_hdpi.png platforms/${PLATFORM_NAME}/templates/icon_hdpi.png
 
 # sdk.git files
-sdk/files/android_rules.xml platforms/${PLATFORM_NAME}/templates/android_rules.xml
-sdk/files/android_test_rules.xml platforms/${PLATFORM_NAME}/templates/android_test_rules.xml
-sdk/files/devices.xml tools/lib/devices.xml
+# 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_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
+# layout device definition
+sdk/files/devices.xml            tools/lib/devices.xml
 
 # emacs support from sdk.git
 sdk/files/android.el tools/lib/android.el