LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge change 22632 into eclair

Browse Source 
* changes:
  Alias rules properties names update
This commit is contained in:
Android (Google) Code Review
2009-08-25 13:55:41 -07:00
parent 1cafac5ce7 9fccdf5b88
commit dfed3cda60
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tools/scripts/alias_rules.xml
View File

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

6
tools/scripts/build.alias.template
View File

@@ -4,16 +4,16 @@
<!-- The build.properties file can be created by you and is never touched <!-- The build.properties file can be created by you and is never touched
by activitycreator. If you want to manually set properties, this is by activitycreator. If you want to manually set properties, this is
the best place to set them. --> the best place to set them. -->
<property file="build.properties"/> <property file="build.properties" />
<!-- The default.properties file is created and updated by activitycreator. <!-- The default.properties file is created and updated by activitycreator.
It will set any properties not already defined by build.properties. --> It will set any properties not already defined by build.properties. -->
<property file="default.properties"/> <property file="default.properties" />
<!-- ************************************************************************************* --> <!-- ************************************************************************************* -->
<!-- Import the default Android build rules. <!-- Import the default Android build rules.
This requires ant 1.6.0 or above. --> 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> </project>