Bundle our own Proguard jar

astrid/build.xml

@@ -61,6 +61,8 @@
 
     <target name="-pre-build" depends="get-version, copy-sources, updatekeys, updatekeys-release, disable-market">
       <mkdir dir="gen" />
+      <property name="proguard.jar" location="antlib/proguard.jar" />
+      <taskdef name="proguard" classname="proguard.ant.ProGuardTask" classpath="${proguard.jar}" />
     </target>
 
     <target name="copy-sources">

astrid/proguard.cfg

@@ -3,7 +3,7 @@
 -dontskipnonpubliclibraryclasses
 -dontpreverify
 -verbose
--optimizations !code/simplification/arithmetic,!field/*,!class/merging/*,!code/allocation/variable,!method/inlining/*
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*,!code/allocation/variable,!method/inlining/*,!field/marking/private
 
 # astrid-specific
 -dontobfuscate