summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsrowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>2009-08-28 17:31:16 +0400
committersrowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>2009-08-28 17:31:16 +0400
commit1de48cd35588aa1829cb721906e322cf557ef3fc (patch)
treec10785b23c1ed7633136bc463e65df9caa71d4fa
parent92c21dd2b3733f2f8c40db5bcb693da3ba403f5b (diff)
downloadzxing-android-embedded-1de48cd35588aa1829cb721906e322cf557ef3fc.tar.xz
SImplified optimization a bit and made it more aggressive.
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1044 59b500cc-1b3d-0410-9834-0bbf25fbcc57
-rw-r--r--build.xml17
1 files changed, 7 insertions, 10 deletions
diff --git a/build.xml b/build.xml
index dd8fd7ee..8afd48b7 100644
--- a/build.xml
+++ b/build.xml
@@ -187,29 +187,26 @@ limitations under the License.
<!-- Optimize with ProGuard -->
<unzip src="../core/core.jar" dest="${out-classes}" overwrite="true"/>
- <jar jarfile="temp.jar" basedir="${out-classes}"/>
- <delete dir="${out-classes}"/>
- <mkdir dir="${out-classes}"/>
+ <mkdir dir="optimized"/>
<property name="libraryjars.path" refid="android.target.classpath"/>
<java jar="${WTK-home}/bin/proguard.jar" fork="true" failonerror="true">
- <jvmarg value="-Dmaximum.inlined.code.length=32"/>
- <arg value="-injars temp.jar"/>
- <arg value="-outjars temp-optimized.jar"/>
+ <jvmarg value="-Dmaximum.inlined.code.length=48"/>
+ <arg value="-injars ${out-classes}"/>
+ <arg value="-outjars optimized"/>
<arg value="-libraryjars ${libraryjars.path}"/>
<arg value="-keep class com.google.zxing.client.android.*Activity"/>
<arg value="-keep class com.google.zxing.client.android.ViewfinderView { public * ; }"/>
<arg value="-keep class com.google.zxing.client.android.SearchBookContents* { public * ; }"/>
<arg value="-target 5"/>
- <arg value="-optimizationpasses 7"/>
+ <arg value="-optimizationpasses 9"/>
<arg value="-dontshrink"/>
<arg value="-dontobfuscate"/>
<arg value="-dontskipnonpubliclibraryclasses"/>
<arg value="-verbose"/>
<arg value="-dump proguard-dump.txt"/>
</java>
- <delete file="temp.jar"/>
- <unzip src="temp-optimized.jar" dest="${out-classes}" overwrite="true"/>
- <delete file="temp-optimized.jar"/>
+ <delete dir="${out-classes}"/>
+ <move file="optimized" tofile="${out-classes}"/>
</target>
<!-- Convert this project's .class files into .dex files. -->