diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-05-25 16:27:34 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2012-05-29 15:02:12 -0700 |
| commit | 249dc0127b12679441013dd78208706feb632c59 (patch) | |
| tree | c852dfaa89f4f0c140323069b701795ac537b5b4 /templates | |
| parent | eaa58fb5b20b4fe9a1b7354391d8afe49de65104 (diff) | |
| download | sdk-249dc0127b12679441013dd78208706feb632c59.zip sdk-249dc0127b12679441013dd78208706feb632c59.tar.gz sdk-249dc0127b12679441013dd78208706feb632c59.tar.bz2 | |
Use aapt output to feed proguard's keep list.
This allows us to only keep classes that are really used either
through code or through XML. Also tweak the default rules for
better control of animated properties.
Added a test of a custom property animation and fixed some other
misc test files.
Change-Id: I7cc5839a764881d8d3c7bfce0a3f12ea7cba660e
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/build.template | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/templates/build.template b/templates/build.template index 1ab7ea2..aea57a2 100644 --- a/templates/build.template +++ b/templates/build.template @@ -28,6 +28,15 @@ --> <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. @@ -39,13 +48,6 @@ application and should be checked into Version Control Systems. --> <loadproperties srcFile="project.properties" /> - <!-- if sdk.dir was not set from one of the property file, then - get it from the ANDROID_HOME env var. --> - <property environment="env" /> - <condition property="sdk.dir" value="${env.ANDROID_HOME}"> - <isset property="env.ANDROID_HOME" /> - </condition> - <!-- 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." |