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 /files/ant | |
| 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 'files/ant')
| -rw-r--r-- | files/ant/build.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/files/ant/build.xml b/files/ant/build.xml index 1f85f5e..cd1bc7d 100644 --- a/files/ant/build.xml +++ b/files/ant/build.xml @@ -648,7 +648,8 @@ nonConstantId="${android.library}" libraryResFolderPathRefid="project.library.res.folder.path" libraryPackagesRefid="project.library.packages" - ignoreAssets="${aapt.ignore.assets}"> + ignoreAssets="${aapt.ignore.assets}" + proguardFile="${out.absolute.dir}/proguard.txt"> <res path="${out.res.absolute.dir}" /> <res path="${resource.absolute.dir}" /> </aapt> @@ -821,6 +822,7 @@ destfile="${preobfuscate.jar.file}" /> <proguard> -include "${proguard.configcmd}" + -include "${out.absolute.dir}/proguard.txt" -injars ${project.all.classes.value} -outjars "${obfuscated.jar.file}" -libraryjars ${project.target.classpath.value} |