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

Merge change 22569 into eclair

Browse Source 
* changes:
  Ant properties names changed
This commit is contained in:
Android (Google) Code Review
2009-08-25 10:00:59 -07:00
parent 945b236290 2968aa3020
commit 1fd0534f48
4 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/anttasks/src/com/android/ant/SetupTask.java
View File

@@ -60,9 +60,9 @@ public final class SetupTask extends ImportTask {
private final static String ANDROID_RULES = "android_rules.xml"; private final static String ANDROID_RULES = "android_rules.xml";
// ant property with the path to the android.jar // ant property with the path to the android.jar
private final static String PROPERTY_ANDROID_JAR = "android-jar"; private final static String PROPERTY_ANDROID_JAR = "android.jar";
// ant property with the path to the framework.jar // ant property with the path to the framework.jar
private final static String PROPERTY_ANDROID_AIDL = "android-aidl"; private final static String PROPERTY_ANDROID_AIDL = "android.aidl";
// ant property with the path to the aapt tool // ant property with the path to the aapt tool
private final static String PROPERTY_AAPT = "aapt"; private final static String PROPERTY_AAPT = "aapt";
// ant property with the path to the aidl tool // ant property with the path to the aidl tool

52
tools/scripts/android_rules.xml
View File

@@ -6,7 +6,7 @@
com.android.ant.AndroidInitTask com.android.ant.AndroidInitTask
The following properties are put in place by the importing task: The following properties are put in place by the importing task:
android-jar, android-aidl, aapt, aidl, and dx android.jar, android.aidl, aapt, aidl, and dx
Additionnaly, the task sets up the following classpath reference: Additionnaly, the task sets up the following classpath reference:
android.target.classpath android.target.classpath
@@ -16,15 +16,15 @@
<!-- Custom tasks --> <!-- Custom tasks -->
<taskdef name="aaptexec" <taskdef name="aaptexec"
classname="com.android.ant.AaptExecLoopTask" classname="com.android.ant.AaptExecLoopTask"
classpathref="android.antlibs"/> classpathref="android.antlibs" />
<taskdef name="apkbuilder" <taskdef name="apkbuilder"
classname="com.android.ant.ApkBuilderTask" classname="com.android.ant.ApkBuilderTask"
classpathref="android.antlibs"/> classpathref="android.antlibs" />
<!-- Properties --> <!-- Properties -->
<property name="android.tools.dir" location="${sdk-location}/tools" /> <property name="android.tools.dir" location="${sdk.dir}/tools" />
<!-- Input directories --> <!-- Input directories -->
<property name="source.dir" location="src" /> <property name="source.dir" location="src" />
@@ -45,22 +45,22 @@
<!-- Out directory for a parent project if this project is an instrumentation project --> <!-- Out directory for a parent project if this project is an instrumentation project -->
<property name="main.out.dir" location="../${out.dir}" /> <property name="main.out.dir" location="../${out.dir}" />
<property name="main.out.classes.dir" location="${main.out.dir}/classes"/> <property name="main.out.classes.dir" location="${main.out.dir}/classes" />
<!-- Intermediate files --> <!-- Intermediate files -->
<property name="dex.file.name" value="classes.dex" /> <property name="dex.file.name" value="classes.dex" />
<property name="intermediate.dex.file" location="${out.dir}/${dex.file.name}" /> <property name="intermediate.dex.file" location="${out.dir}/${dex.file.name}" />
<!-- The final package file to generate --> <!-- The final package file to generate -->
<property name="out.debug.unaligned.package" location="${out.dir}/${ant.project.name}-debug-unaligned.apk"/> <property name="out.debug.unaligned.package" location="${out.dir}/${ant.project.name}-debug-unaligned.apk" />
<property name="out.debug.package" location="${out.dir}/${ant.project.name}-debug.apk"/> <property name="out.debug.package" location="${out.dir}/${ant.project.name}-debug.apk" />
<property name="out.unsigned.package" location="${out.dir}/${ant.project.name}-unsigned.apk"/> <property name="out.unsigned.package" location="${out.dir}/${ant.project.name}-unsigned.apk" />
<property name="out.unaligned.package" location="${out.dir}/${ant.project.name}-unaligned.apk"/> <property name="out.unaligned.package" location="${out.dir}/${ant.project.name}-unaligned.apk" />
<property name="out.release.package" location="${out.dir}/${ant.project.name}-release.apk"/> <property name="out.release.package" location="${out.dir}/${ant.project.name}-release.apk" />
<!-- Tools --> <!-- Tools -->
<condition property="exe" value=".exe" else=""><os family="windows"/></condition> <condition property="exe" value=".exe" else=""><os family="windows" /></condition>
<property name="adb" location="${android.tools.dir}/adb${exe}"/> <property name="adb" location="${android.tools.dir}/adb${exe}" />
<property name="zipalign" location="${android.tools.dir}/zipalign${exe}" /> <property name="zipalign" location="${android.tools.dir}/zipalign${exe}" />
<!-- Rules --> <!-- Rules -->
@@ -88,7 +88,7 @@
<arg value="-S" /> <arg value="-S" />
<arg path="${resource.dir}" /> <arg path="${resource.dir}" />
<arg value="-I" /> <arg value="-I" />
<arg path="${android-jar}" /> <arg path="${android.jar}" />
</exec> </exec>
</target> </target>
@@ -96,11 +96,11 @@
<target name="-aidl" depends="-dirs"> <target name="-aidl" depends="-dirs">
<echo>Compiling aidl files into Java classes...</echo> <echo>Compiling aidl files into Java classes...</echo>
<apply executable="${aidl}" failonerror="true"> <apply executable="${aidl}" failonerror="true">
<arg value="-p${android-aidl}" /> <arg value="-p${android.aidl}" />
<arg value="-I${source.dir}" /> <arg value="-I${source.dir}" />
<arg value="-o${gen.dir}" /> <arg value="-o${gen.dir}" />
<fileset dir="${source.dir}"> <fileset dir="${source.dir}">
<include name="**/*.aidl"/> <include name="**/*.aidl" />
</fileset> </fileset>
</apply> </apply>
</target> </target>
@@ -114,8 +114,8 @@
<src path="${source.dir}" /> <src path="${source.dir}" />
<src path="${gen.dir}" /> <src path="${gen.dir}" />
<classpath> <classpath>
<fileset dir="${external.libs.dir}" includes="*.jar"/> <fileset dir="${external.libs.dir}" includes="*.jar" />
<pathelement path="${main.out.classes.dir}"/> <pathelement path="${main.out.classes.dir}" />
</classpath> </classpath>
</javac> </javac>
</target> </target>
@@ -127,7 +127,7 @@
<arg value="--dex" /> <arg value="--dex" />
<arg value="--output=${intermediate.dex.file}" /> <arg value="--output=${intermediate.dex.file}" />
<arg path="${out.classes.dir}" /> <arg path="${out.classes.dir}" />
<fileset dir="${external.libs.dir}" includes="*.jar"/> <fileset dir="${external.libs.dir}" includes="*.jar" />
</apply> </apply>
</target> </target>
@@ -143,7 +143,7 @@
manifest="AndroidManifest.xml" manifest="AndroidManifest.xml"
resources="${resource.dir}" resources="${resource.dir}"
assets="${asset.dir}" assets="${asset.dir}"
androidjar="${android-jar}" androidjar="${android.jar}"
outfolder="${out.dir}" outfolder="${out.dir}"
basename="${ant.project.name}" /> basename="${ant.project.name}" />
</target> </target>
@@ -207,10 +207,10 @@
<!-- Gets passwords --> <!-- Gets passwords -->
<input <input
message="Please enter keystore password (store:${key.store}):" message="Please enter keystore password (store:${key.store}):"
addproperty="key.store.password"/> addproperty="key.store.password" />
<input <input
message="Please enter password for alias '${key.alias}':" message="Please enter password for alias '${key.alias}':"
addproperty="key.alias.password"/> addproperty="key.alias.password" />
<!-- Signs the APK --> <!-- Signs the APK -->
<echo>Signing final apk...</echo> <echo>Signing final apk...</echo>
@@ -220,7 +220,7 @@
keystore="${key.store}" keystore="${key.store}"
storepass="${key.store.password}" storepass="${key.store.password}"
alias="${key.alias}" alias="${key.alias}"
keypass="${key.alias.password}"/> keypass="${key.alias.password}" />
<!-- Zip aligns the APK --> <!-- Zip aligns the APK -->
<echo>Running zip align on final apk...</echo> <echo>Running zip align on final apk...</echo>
@@ -255,19 +255,19 @@
<!-- Uninstalls the package from the default emulator/device --> <!-- Uninstalls the package from the default emulator/device -->
<target name="-uninstall-check"> <target name="-uninstall-check">
<condition property="uninstall.run"> <condition property="uninstall.run">
<isset property="application-package" /> <isset property="application.package" />
</condition> </condition>
</target> </target>
<target name="-uninstall-error" depends="-uninstall-check" unless="uninstall.run"> <target name="-uninstall-error" depends="-uninstall-check" unless="uninstall.run">
<echo>Unable to run 'ant uninstall', application-package is not defined in build.properties</echo> <echo>Unable to run 'ant uninstall', application.package is not defined in build.properties</echo>
</target> </target>
<target name="uninstall" depends="-uninstall-error" if="uninstall.run" description="Uninstalls the application from a running emulator or device."> <target name="uninstall" depends="-uninstall-error" if="uninstall.run" description="Uninstalls the application from a running emulator or device.">
<echo>Uninstalling ${application-package} from the default emulator or device...</echo> <echo>Uninstalling ${application.package} from the default emulator or device...</echo>
<exec executable="${adb}" failonerror="true"> <exec executable="${adb}" failonerror="true">
<arg value="uninstall" /> <arg value="uninstall" />
<arg value="${application-package}" /> <arg value="${application.package}" />
</exec> </exec>
</target> </target>

12
tools/scripts/build.template
View File

@@ -11,7 +11,7 @@
used by the Ant rules. used by the Ant rules.
Here are some properties you may want to change/update: Here are some properties you may want to change/update:
application-package application.package
the name of your application package as defined in the manifest. Used by the the name of your application package as defined in the manifest. Used by the
'uninstall' rule. 'uninstall' rule.
source.dir source.dir
@@ -37,11 +37,11 @@
<!-- Custom Android task to deal with the project target, and import the proper rules. <!-- Custom Android task to deal with the project target, and import the proper rules.
This requires ant 1.6.0 or above. --> This requires ant 1.6.0 or above. -->
<path id="android.antlibs"> <path id="android.antlibs">
<pathelement path="${sdk-location}/tools/lib/anttasks.jar" /> <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
<pathelement path="${sdk-location}/tools/lib/sdklib.jar" /> <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
<pathelement path="${sdk-location}/tools/lib/androidprefs.jar" /> <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
<pathelement path="${sdk-location}/tools/lib/apkbuilder.jar" /> <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
<pathelement path="${sdk-location}/tools/lib/jarutils.jar" /> <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
</path> </path>
<taskdef name="setup" <taskdef name="setup"

6
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java
View File

@@ -35,9 +35,9 @@ import java.util.Map.Entry;
public final class ProjectProperties { public final class ProjectProperties {
/** The property name for the project target */ /** The property name for the project target */
public final static String PROPERTY_TARGET = "target"; public final static String PROPERTY_TARGET = "target";
public final static String PROPERTY_APK_CONFIGS = "apk-configurations"; public final static String PROPERTY_APK_CONFIGS = "apk.configurations";
public final static String PROPERTY_SDK = "sdk-location"; public final static String PROPERTY_SDK = "sdk.dir";
public final static String PROPERTY_APP_PACKAGE = "application-package"; public final static String PROPERTY_APP_PACKAGE = "application.package";
public static enum PropertyType { public static enum PropertyType {
BUILD("build.properties", BUILD_HEADER), BUILD("build.properties", BUILD_HEADER),