diff options
Diffstat (limited to 'testapps')
| -rw-r--r-- | testapps/basicProjectWithAidl/ant.properties (renamed from testapps/basicProjectWithAidl/build.properties) | 2 | ||||
| -rw-r--r-- | testapps/basicProjectWithAidl/build.xml | 112 | ||||
| -rw-r--r-- | testapps/basicProjectWithAidl/project.properties (renamed from testapps/basicProjectWithAidl/default.properties) | 0 |
3 files changed, 61 insertions, 53 deletions
diff --git a/testapps/basicProjectWithAidl/build.properties b/testapps/basicProjectWithAidl/ant.properties index ee52d86d9..b0971e891 100644 --- a/testapps/basicProjectWithAidl/build.properties +++ b/testapps/basicProjectWithAidl/ant.properties @@ -1,6 +1,6 @@ # This file is used to override default values used by the Ant build system. # -# This file must be checked in Version Control Systems, as it is +# This file must be checked into Version Control Systems, as it is # integral to the build system of your project. # This file is only used by the Ant script. diff --git a/testapps/basicProjectWithAidl/build.xml b/testapps/basicProjectWithAidl/build.xml index 9983df5d8..c0aff2d28 100644 --- a/testapps/basicProjectWithAidl/build.xml +++ b/testapps/basicProjectWithAidl/build.xml @@ -1,15 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="basicProject" default="help"> -<!-- The local.properties file is created and updated by the 'android' - tool. - It contains the path to the SDK. It should *NOT* be checked into - Version Control Systems. --> + <!-- The local.properties file is created and updated by the 'android' tool. + It contains the path to the SDK. It should *NOT* be checked into + Version Control Systems. --> <property file="local.properties" /> - <!-- The build.properties file can be created by you and is never touched - by the 'android' tool. This is the place to change some of the - default property values used by the Ant rules. + <!-- The ant.properties file can be created by you. It is only edited by the + 'android' tool to add properties to it. + This is the place to change some Ant specific build properties. Here are some properties you may want to change/update: source.dir @@ -17,6 +16,9 @@ out.dir The name of the output directory. Default is 'bin'. + For other overridable properties, look at the beginning of the rules + files in the SDK, at tools/ant/build.xml + Properties related to the SDK location or the project target should be updated using the 'android' tool with the 'update' action. @@ -24,61 +26,67 @@ application and should be checked into Version Control Systems. --> - <property file="build.properties" /> - - <!-- The default.properties file is created and updated by the 'android' + <property file="ant.properties" /> + + <!-- if sdk.dir was not set from one of the property file, then + get it from the ANDROID_HOME env var. + This must be done before we load project.properties since + the proguard config can use sdk.dir --> + <property environment="env" /> + <condition property="sdk.dir" value="${env.ANDROID_HOME}"> + <isset property="env.ANDROID_HOME" /> + </condition> + + <!-- The project.properties file is created and updated by the 'android' tool, as well as ADT. + + This contains project specific properties such as project target, and library + dependencies. Lower level build properties are stored in ant.properties + (or in .classpath for Eclipse projects). + This file is an integral part of the build system for your application and should be checked into Version Control Systems. --> - <property file="default.properties" /> - - <!-- Custom Android task to deal with the project target, and import the - proper rules. - This requires ant 1.6.0 or above. --> - <path id="android.antlibs"> - <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" /> - <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" /> - <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" /> - </path> - - <taskdef name="setup" - classname="com.android.ant.SetupTask" - classpathref="android.antlibs" /> - -<!-- extension targets. Uncomment the ones where you want to do custom work - in between standard targets --> -<!-- - <target name="-pre-build"> - </target> - <target name="-pre-compile"> - </target> - - [This is typically used for code obfuscation. - Compiled code location: ${out.classes.absolute.dir} - If this is not done in place, override ${out.dex.input.absolute.dir}] - <target name="-post-compile"> - </target> ---> - - - <!-- Execute the Android Setup task that will setup some properties - specific to the target, and import the build rules files. - - The rules file is imported from - <SDK>/platforms/<target_platform>/ant/ant_rules_r#.xml + <loadproperties srcFile="project.properties" /> + + <!-- quick check on sdk.dir --> + <fail + message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable." + unless="sdk.dir" + /> + + <!-- + Import per project custom build rules if present at the root of the project. + This is the place to put custom intermediary targets such as: + -pre-build + -pre-compile + -post-compile (This is typically used for code obfuscation. + Compiled code location: ${out.classes.absolute.dir} + If this is not done in place, override ${out.dex.input.absolute.dir}) + -post-package + -post-build + -pre-clean + --> + <import file="custom_rules.xml" optional="true" /> + + <!-- Import the actual build file. To customize existing targets, there are two options: - Customize only one target: - copy/paste the target into this file, *before* the - <setup> task. + <import> task. - customize it to your needs. - - Customize the whole script. + - Customize the whole content of build.xml - copy/paste the content of the rules files (minus the top node) - into this file, *after* the <setup> task - - disable the import of the rules by changing the setup task - below to <setup import="false" />. + into this file, replacing the <import> task. - customize to your needs. + + *********************** + ****** IMPORTANT ****** + *********************** + In all cases you must update the value of version-tag below to read 'custom' instead of an integer, + in order to avoid having your file be overridden by tools such as "android update project" --> - <setup /> + <!-- version-tag: 1 --> + <import file="${sdk.dir}/tools/ant/build.xml" /> </project> diff --git a/testapps/basicProjectWithAidl/default.properties b/testapps/basicProjectWithAidl/project.properties index 38db6608b..38db6608b 100644 --- a/testapps/basicProjectWithAidl/default.properties +++ b/testapps/basicProjectWithAidl/project.properties |