diff options
| author | Yohann Roussel <yroussel@google.com> | 2014-05-28 16:14:01 +0200 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2014-05-28 16:14:02 +0200 |
| commit | 5cc19feaae5d7740b04a37daba157d93133853cc (patch) | |
| tree | 90dddef0756871755964c0b48604a7bc99d3adc9 /tools/mainDexClasses.rules | |
| parent | 874c9c500828b4030bb862485702b2d6c5e73ae3 (diff) | |
| download | prebuilts_sdk-5cc19feaae5d7740b04a37daba157d93133853cc.zip prebuilts_sdk-5cc19feaae5d7740b04a37daba157d93133853cc.tar.gz prebuilts_sdk-5cc19feaae5d7740b04a37daba157d93133853cc.tar.bz2 | |
Update multidex tools.
Update up to dalvik master commit: 7fd86ebf6ea41f8e367866f127a593bad849a8cb
Includes:
- Force dx compilation target to java 6.
- Make a better detection of index limit in multidex.
- Split multicatch so they have different handlers.
- Return the correct error code in multi-thread mode
- Keep all annotation in main dex.
- Transform incorrect invokevirtual ops to invokedirect.
Change-Id: I0f6033475e76abee918918e5b47972abbb701d16
Diffstat (limited to 'tools/mainDexClasses.rules')
| -rw-r--r-- | tools/mainDexClasses.rules | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/mainDexClasses.rules b/tools/mainDexClasses.rules index f57cbdd..af4085a 100644 --- a/tools/mainDexClasses.rules +++ b/tools/mainDexClasses.rules @@ -20,3 +20,8 @@ -keep public class * extends android.app.backup.BackupAgent {
<init>();
}
+# We need to keep all annotation classes because proguard does not trace annotation attribute
+# it just filter the annotation attributes according to annotation classes it already kept.
+ -keep public class * extends java.lang.annotation.Annotation {
+ *;
+ }
|