mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-11-10 13:04:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reinstate more optimization, but avoid disagreement with dex by properly disabling the controversial optimizations: field and method merging, mostly

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1365 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2010-05-15 11:28:01 +00:00
parent 737e0de917
commit 391626bb76
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/build.xml
View file

@ -202,11 +202,9 @@ limitations under the License.
<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.book.SearchBookContents* { public * ; }"/>
<!-- This works around some strange Android/ProGuard problem verifying MaskUtil -->
<arg value="-keep class com.google.zxing.qrcode.encoder.MaskUtil { public * ; }"/>
<arg value="-target 5"/>
<!-- Keeping this low also avoids some weird Android/ProGuard issue I couldn't resolve otherwise -->
<arg value="-optimizationpasses 2"/>
<arg value="-optimizationpasses 5"/>
<arg value="-optimizations !field/*,!class/merging/*"/> <!-- works around dex VerifyError -->
<arg value="-dontshrink"/>
<arg value="-dontobfuscate"/>
<arg value="-dontskipnonpubliclibraryclasses"/>