From 4eb2896eea2b0abf4763dfd9d611b52b25361913 Mon Sep 17 00:00:00 2001 From: Sean Owen Date: Thu, 12 Feb 2015 14:41:00 +0000 Subject: [PATCH] Work around enum + proguard + dex problem --- android/proguard.cfg | 2 +- androidtest/proguard.cfg | 2 +- glass/proguard.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/proguard.cfg b/android/proguard.cfg index 3dc25f17f9..01cceefa47 100644 --- a/android/proguard.cfg +++ b/android/proguard.cfg @@ -10,7 +10,7 @@ # be complete or up to date. (The "arithmetic" optimization can be # used if you are only targeting Android 2.0 or later.) Make sure you # test thoroughly if you go this route. --optimizations !code/simplification/cast,!field/*,!class/merging/*,!code/allocation/variable,!method/marking/private +-optimizations !code/simplification/cast,!field/*,!class/merging/*,!class/unboxing/enum,!code/allocation/variable,!method/marking/private -optimizationpasses 5 -allowaccessmodification -dontpreverify diff --git a/androidtest/proguard.cfg b/androidtest/proguard.cfg index 3dc25f17f9..01cceefa47 100644 --- a/androidtest/proguard.cfg +++ b/androidtest/proguard.cfg @@ -10,7 +10,7 @@ # be complete or up to date. (The "arithmetic" optimization can be # used if you are only targeting Android 2.0 or later.) Make sure you # test thoroughly if you go this route. --optimizations !code/simplification/cast,!field/*,!class/merging/*,!code/allocation/variable,!method/marking/private +-optimizations !code/simplification/cast,!field/*,!class/merging/*,!class/unboxing/enum,!code/allocation/variable,!method/marking/private -optimizationpasses 5 -allowaccessmodification -dontpreverify diff --git a/glass/proguard.cfg b/glass/proguard.cfg index 3dc25f17f9..01cceefa47 100644 --- a/glass/proguard.cfg +++ b/glass/proguard.cfg @@ -10,7 +10,7 @@ # be complete or up to date. (The "arithmetic" optimization can be # used if you are only targeting Android 2.0 or later.) Make sure you # test thoroughly if you go this route. --optimizations !code/simplification/cast,!field/*,!class/merging/*,!code/allocation/variable,!method/marking/private +-optimizations !code/simplification/cast,!field/*,!class/merging/*,!class/unboxing/enum,!code/allocation/variable,!method/marking/private -optimizationpasses 5 -allowaccessmodification -dontpreverify