diff options
| author | Brian Carlstrom <bdc@google.com> | 2015-01-08 08:24:06 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2015-01-08 10:29:11 -0800 |
| commit | cd9e071098d0539dda3a4a5d3f45cfd8814de4ed (patch) | |
| tree | 9ac962825d41c4fb8ad1ec0fc2e8b441b42d3869 /src/proguard/classfile/util/MethodLinker.java | |
| parent | 9961286c06c25cd03464d3e2b00bd9b9dedf96ba (diff) | |
| download | proguard-cd9e071098d0539dda3a4a5d3f45cfd8814de4ed.tar.gz | |
Upgrade Proguard to 5.1.
Downloaded from:
http://sourceforge.net/projects/proguard/files/proguard/5.1/
Bug: 17550647
(cherry picked from commit 2270795fbe0b277bfd49f40950ecaa78583175cc)
Change-Id: I4d4c6b4f11aca8d5595b7f285c675bc5873d5e24
Diffstat (limited to 'src/proguard/classfile/util/MethodLinker.java')
| -rw-r--r-- | src/proguard/classfile/util/MethodLinker.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/proguard/classfile/util/MethodLinker.java b/src/proguard/classfile/util/MethodLinker.java index 56b6723..4b4afa2 100644 --- a/src/proguard/classfile/util/MethodLinker.java +++ b/src/proguard/classfile/util/MethodLinker.java @@ -2,7 +2,7 @@ * ProGuard -- shrinking, optimization, obfuscation, and preverification * of Java bytecode. * - * Copyright (c) 2002-2013 Eric Lafortune (eric@graphics.cornell.edu) + * Copyright (c) 2002-2014 Eric Lafortune (eric@graphics.cornell.edu) * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free @@ -51,7 +51,7 @@ implements ClassVisitor, // Collect all non-private members in this class hierarchy. clazz.hierarchyAccept(true, true, true, false, new AllMethodVisitor( - new MemberAccessFilter(0, ClassConstants.INTERNAL_ACC_PRIVATE | ClassConstants.INTERNAL_ACC_STATIC, + new MemberAccessFilter(0, ClassConstants.ACC_PRIVATE | ClassConstants.ACC_STATIC, this))); // Clean up for the next class hierarchy. @@ -69,8 +69,7 @@ implements ClassVisitor, // Special cases: <clinit> and <init> are always kept unchanged. // We can ignore them here. - if (name.equals(ClassConstants.INTERNAL_METHOD_NAME_CLINIT) || - name.equals(ClassConstants.INTERNAL_METHOD_NAME_INIT)) + if (ClassUtil.isInitializer(name)) { return; } |