summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYohann Roussel <yroussel@google.com>2015-05-28 18:02:31 +0200
committerYohann Roussel <yroussel@google.com>2015-05-28 18:02:31 +0200
commit2b615edc587db597aef0fb2fe9e526890d0a0038 (patch)
treea42f50a661b2cbc473212ea737ba310d328117f9
parentc2ac6825048f1b81d945e25a13aa5f4203311b8b (diff)
downloadtoolchain_jack-2b615edc587db597aef0fb2fe9e526890d0a0038.zip
toolchain_jack-2b615edc587db597aef0fb2fe9e526890d0a0038.tar.gz
toolchain_jack-2b615edc587db597aef0fb2fe9e526890d0a0038.tar.bz2
TypeDefRemover is now keeping StringDef and IntDef
Removing them is preventing compilation of SystemUI and a check showed that the classfile tool was keeping them. Bug: 21099584 Change-Id: I12bfdf4ef726e4f0c7435af3c484e773dff4e265
-rw-r--r--jack/src/com/android/jack/transformations/typedef/TypeDefRemover.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/jack/src/com/android/jack/transformations/typedef/TypeDefRemover.java b/jack/src/com/android/jack/transformations/typedef/TypeDefRemover.java
index b63ea93..d646606 100644
--- a/jack/src/com/android/jack/transformations/typedef/TypeDefRemover.java
+++ b/jack/src/com/android/jack/transformations/typedef/TypeDefRemover.java
@@ -116,9 +116,6 @@ public class TypeDefRemover extends TypeRemover {
@Override
protected boolean mustBeRemoved(@Nonnull JDefinedClassOrInterface type) {
- if (type == stringDef || type == intDef) {
- return true;
- }
if (type instanceof JDefinedAnnotationType) {
if ((!type.getAnnotations(stringDef).isEmpty()) || !type.getAnnotations(intDef).isEmpty()) {
JDefinedAnnotationType typeDef = (JDefinedAnnotationType) type;