Merge change 22632 into eclair

* changes:
  Alias rules properties names update

tools/scripts/alias_rules.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="alias_rules" default="package">
 
-    <!-- No user servicable parts below. -->
+    <!-- No user serviceable parts below. -->
 
     <!-- Input directories -->
-    <property name="resource-dir" value="res" />
+    <property name="resource.dir" value="res" />
 
     <!-- The final package file to generate -->
-    <property name="out-package" value="${ant.project.name}.apk" />
+    <property name="out.package" value="${ant.project.name}.apk" />
 
     <!-- Tools -->
-    <condition property="aapt" value="${android-tools}/aapt.exe" else="${android-tools}/aapt" >
+    <condition property="aapt" value="${android.tools.dir}/aapt.exe" else="${android.tools.dir}/aapt">
         <os family="windows" />
     </condition>
-    <condition property="adb" value="${android-tools}/adb.exe" else="${android-tools}/adb" >
+    <condition property="adb" value="${android.tools.dir}/adb.exe" else="${android.tools.dir}/adb">
         <os family="windows" />
     </condition>
-    <property name="android-jar" value="${sdk-folder}/android.jar" />
+    <property name="android.jar" value="${sdk.dir}/android.jar" />
 
     <!-- Rules -->
 
@@ -29,11 +29,11 @@
             <arg value="-M" />
             <arg value="AndroidManifest.xml" />
             <arg value="-S" />
-            <arg value="${resource-dir}" />
+            <arg value="${resource.dir}" />
             <arg value="-I" />
-            <arg value="${android-jar}" />
+            <arg value="${android.jar}" />
             <arg value="-F" />
-            <arg value="${out-package}" />
+            <arg value="${out.package}" />
         </exec>
     </target>
 
@@ -45,7 +45,7 @@
         <echo>Sending package to default emulator...</echo>
         <exec executable="${adb}" failonerror="true">
             <arg value="install" />
-            <arg value="${out-package}" />
+            <arg value="${out.package}" />
         </exec>
     </target>
 

tools/scripts/build.alias.template

@@ -14,6 +14,6 @@
     <!-- Import the default Android build rules.
          This requires ant 1.6.0 or above. -->
 
-    <import file="${sdk-folder}/tools/lib/alias_rules.xml" />
+    <import file="${sdk.dir}/tools/lib/alias_rules.xml" />
 
 </project>