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

Alias rules properties names update

Browse Source 
android-tools change to android.tools.dir
sdk-folder to sdk.dir
resource-dir to resource.dir
out-package to out.package
Some minor style changes introduced.
This commit is contained in:
Piotr Gurgul
2009-08-25 10:59:55 -07:00
parent 1fd0534f48
commit 9fccdf5b88
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"?>
<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" >
<os family="windows"/>
<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" >
<os family="windows"/>
<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>

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

@@ -4,16 +4,16 @@
<!-- The build.properties file can be created by you and is never touched
by activitycreator. If you want to manually set properties, this is
the best place to set them. -->
<property file="build.properties"/>
<property file="build.properties" />
<!-- The default.properties file is created and updated by activitycreator.
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. -->
<import file="${sdk-folder}/tools/lib/alias_rules.xml" />
<import file="${sdk.dir}/tools/lib/alias_rules.xml" />
</project>