From 2b615edc587db597aef0fb2fe9e526890d0a0038 Mon Sep 17 00:00:00 2001
From: Yohann Roussel <yroussel@google.com>
Date: Thu, 28 May 2015 18:02:31 +0200
Subject: 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
---
 jack/src/com/android/jack/transformations/typedef/TypeDefRemover.java | 3 ---
 1 file changed, 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;
-- 
cgit v1.1