Merge "Fixed bug with keepclassesmembernames" into jack-wip-dev

6 files changed, 33 insertions, 49 deletions

diff --git a/jack-tests/tests/com/android/jack/shrob/test016/dx/Tests.java b/jack-tests/tests/com/android/jack/shrob/test016/dx/Tests.java
index 1cb6c3f..76eb138 100644
--- a/jack-tests/tests/com/android/jack/shrob/test016/dx/Tests.java
+++ b/jack-tests/tests/com/android/jack/shrob/test016/dx/Tests.java
@@ -26,13 +26,13 @@ public class Tests {
 
   @Test
   public void test() {
-    Assert.assertEquals("com.android.jack.shrob.test016.jack.a", KeepClass.value());
+    Assert.assertEquals("com.android.jack.shrob.test016.jack.RenamedA", KeepClass.value());
     Assert.assertEquals("Lcom.android.jack.shrob.test016.jack.A;", KeepClass.value2());
-    Assert.assertEquals("com/android/jack/shrob/test016/jack/a", KeepClass.value3());
+    Assert.assertEquals("com/android/jack/shrob/test016/jack/RenamedA", KeepClass.value3());
     Assert.assertEquals("Lcom/android/jack/shrob/test016/jack/A;", KeepClass.value4());
     Assert.assertEquals("A", KeepClass.value5());
     Assert.assertEquals("[com.android.jack.shrob.test016.jack.A", KeepClass.value6());
-    Assert.assertEquals("com.android.jack.shrob.test016.jack.a[]", KeepClass.value7());
+    Assert.assertEquals("com.android.jack.shrob.test016.jack.RenamedA[]", KeepClass.value7());
     Assert.assertEquals("dfgdgcom.android.jack.shrob.test016.jack.A", KeepClass.value8());
     Assert.assertEquals("com.android.jack.shrob.test016.jack.Afgdg", KeepClass.value9());
   }
diff --git a/jack-tests/tests/com/android/jack/shrob/test016/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test016/proguard.flags001.mapping
index 74ff488..6a4b6b1 100644
--- a/jack-tests/tests/com/android/jack/shrob/test016/proguard.flags001.mapping
+++ b/jack-tests/tests/com/android/jack/shrob/test016/proguard.flags001.mapping
@@ -1,22 +1,6 @@
 com.android.jack.shrob.test016.jack.Annot -> com.android.jack.shrob.test016.jack.RenamedAnnot:
-    java.lang.String value() -> renamedValue
-com.android.jack.shrob.test016.jack.KeepClass -> com.android.jack.shrob.test016.jack.KeepClass:
-    void <init>() -> <init>
-    java.lang.String value() -> renamedValue
-    java.lang.String value2() -> renamedValue2
-    java.lang.String value3() -> renamedValue3
-    java.lang.String value4() -> renamedValue4
-    java.lang.String value5() -> renamedValue5
-    java.lang.String value6() -> renamedValue6
-    java.lang.String value7() -> renamedValue7
-    java.lang.String value8() -> renamedValue8
-    java.lang.String value9() -> renamedValue9
 com.android.jack.shrob.test016.jack.Annot4 -> com.android.jack.shrob.test016.jack.RenamedAnnot4:
-    java.lang.String value() -> renamedValue
 com.android.jack.shrob.test016.jack.Annot5 -> com.android.jack.shrob.test016.jack.RenamedAnnot5:
-    java.lang.String value() -> renamedValue
 com.android.jack.shrob.test016.jack.A -> com.android.jack.shrob.test016.jack.RenamedA:
 com.android.jack.shrob.test016.jack.Annot2 -> com.android.jack.shrob.test016.jack.RenamedAnnot2:
-    java.lang.String value() -> renamedValue
-com.android.jack.shrob.test016.jack.Annot3 -> com.android.jack.shrob.test016.jack.RenamedAnnot3:
-    java.lang.String value() -> renamedValue
\ No newline at end of file
+com.android.jack.shrob.test016.jack.Annot3 -> com.android.jack.shrob.test016.jack.RenamedAnnot3:
\ No newline at end of file
diff --git a/jack-tests/tests/com/android/jack/shrob/test016/refsFlattenPackage/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test016/refsFlattenPackage/expected-001.txt
index 46f9ec3..2958167 100644
--- a/jack-tests/tests/com/android/jack/shrob/test016/refsFlattenPackage/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test016/refsFlattenPackage/expected-001.txt
@@ -1,5 +1,5 @@
 com.android.jack.shrob.test016.jack.Annot -> com.android.jack.shrob.test016.jack.Nbbch:
-    java.lang.String value() -> jnyir__
+    java.lang.String value() -> value
 com.android.jack.shrob.test016.jack.KeepClass -> com.android.jack.shrob.test016.jack.KeepClass:
     void <init>() -> <init>
     java.lang.String value() -> value
@@ -12,12 +12,12 @@ com.android.jack.shrob.test016.jack.KeepClass -> com.android.jack.shrob.test016.
     java.lang.String value8() -> value8
     java.lang.String value9() -> value9
 com.android.jack.shrob.test016.jack.Annot4 -> com.android.jack.shrob.test016.jack.Nbbch4:
-    java.lang.String value() -> jnyir__
+    java.lang.String value() -> value
 com.android.jack.shrob.test016.jack.Annot5 -> com.android.jack.shrob.test016.jack.Nbbch5:
-    java.lang.String value() -> jnyir__
+    java.lang.String value() -> value
 com.android.jack.shrob.test016.jack.A -> com.android.jack.shrob.test016.jack.N:
     void <init>() -> <init>
 com.android.jack.shrob.test016.jack.Annot2 -> com.android.jack.shrob.test016.jack.Nbbch2:
-    java.lang.String value() -> jnyir__
+    java.lang.String value() -> value
 com.android.jack.shrob.test016.jack.Annot3 -> com.android.jack.shrob.test016.jack.Nbbch3:
-    java.lang.String value() -> jnyir__
+    java.lang.String value() -> value
diff --git a/jack-tests/tests/com/android/jack/shrob/test016/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test016/refsObfuscationWithMapping/expected-001.txt
index bc4aa5c..9bbbca9 100644
--- a/jack-tests/tests/com/android/jack/shrob/test016/refsObfuscationWithMapping/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test016/refsObfuscationWithMapping/expected-001.txt
@@ -1,23 +1,23 @@
 com.android.jack.shrob.test016.jack.Annot -> com.android.jack.shrob.test016.jack.RenamedAnnot:
-    java.lang.String value() -> renamedValue
+    java.lang.String value() -> value
 com.android.jack.shrob.test016.jack.KeepClass -> com.android.jack.shrob.test016.jack.KeepClass:
     void <init>() -> <init>
-    java.lang.String value() -> renamedValue
-    java.lang.String value2() -> renamedValue2
-    java.lang.String value3() -> renamedValue3
-    java.lang.String value4() -> renamedValue4
-    java.lang.String value5() -> renamedValue5
-    java.lang.String value6() -> renamedValue6
-    java.lang.String value7() -> renamedValue7
-    java.lang.String value8() -> renamedValue8
-    java.lang.String value9() -> renamedValue9
+    java.lang.String value() -> value
+    java.lang.String value2() -> value2
+    java.lang.String value3() -> value3
+    java.lang.String value4() -> value4
+    java.lang.String value5() -> value5
+    java.lang.String value6() -> value6
+    java.lang.String value7() -> value7
+    java.lang.String value8() -> value8
+    java.lang.String value9() -> value9
 com.android.jack.shrob.test016.jack.Annot4 -> com.android.jack.shrob.test016.jack.RenamedAnnot4:
-    java.lang.String value() -> renamedValue
+    java.lang.String value() -> value
 com.android.jack.shrob.test016.jack.Annot5 -> com.android.jack.shrob.test016.jack.RenamedAnnot5:
-    java.lang.String value() -> renamedValue
+    java.lang.String value() -> value
 com.android.jack.shrob.test016.jack.A -> com.android.jack.shrob.test016.jack.RenamedA:
     void <init>() -> <init>
 com.android.jack.shrob.test016.jack.Annot2 -> com.android.jack.shrob.test016.jack.RenamedAnnot2:
-    java.lang.String value() -> renamedValue
+    java.lang.String value() -> value
 com.android.jack.shrob.test016.jack.Annot3 -> com.android.jack.shrob.test016.jack.RenamedAnnot3:
-    java.lang.String value() -> renamedValue
+    java.lang.String value() -> value
diff --git a/jack-tests/tests/com/android/jack/shrob/test016/refsObfuscationWithoutMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test016/refsObfuscationWithoutMapping/expected-001.txt
index 46f9ec3..2958167 100644
--- a/jack-tests/tests/com/android/jack/shrob/test016/refsObfuscationWithoutMapping/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test016/refsObfuscationWithoutMapping/expected-001.txt
@@ -1,5 +1,5 @@
 com.android.jack.shrob.test016.jack.Annot -> com.android.jack.shrob.test016.jack.Nbbch:
-    java.lang.String value() -> jnyir__
+    java.lang.String value() -> value
 com.android.jack.shrob.test016.jack.KeepClass -> com.android.jack.shrob.test016.jack.KeepClass:
     void <init>() -> <init>
     java.lang.String value() -> value
@@ -12,12 +12,12 @@ com.android.jack.shrob.test016.jack.KeepClass -> com.android.jack.shrob.test016.
     java.lang.String value8() -> value8
     java.lang.String value9() -> value9
 com.android.jack.shrob.test016.jack.Annot4 -> com.android.jack.shrob.test016.jack.Nbbch4:
-    java.lang.String value() -> jnyir__
+    java.lang.String value() -> value
 com.android.jack.shrob.test016.jack.Annot5 -> com.android.jack.shrob.test016.jack.Nbbch5:
-    java.lang.String value() -> jnyir__
+    java.lang.String value() -> value
 com.android.jack.shrob.test016.jack.A -> com.android.jack.shrob.test016.jack.N:
     void <init>() -> <init>
 com.android.jack.shrob.test016.jack.Annot2 -> com.android.jack.shrob.test016.jack.Nbbch2:
-    java.lang.String value() -> jnyir__
+    java.lang.String value() -> value
 com.android.jack.shrob.test016.jack.Annot3 -> com.android.jack.shrob.test016.jack.Nbbch3:
-    java.lang.String value() -> jnyir__
+    java.lang.String value() -> value
diff --git a/jack-tests/tests/com/android/jack/shrob/test016/refsRepackageClasses/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test016/refsRepackageClasses/expected-001.txt
index b9ac815..87a0a28 100644
--- a/jack-tests/tests/com/android/jack/shrob/test016/refsRepackageClasses/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test016/refsRepackageClasses/expected-001.txt
@@ -12,12 +12,12 @@ com.android.jack.shrob.test016.jack.KeepClass -> com.android.jack.shrob.test016.
     java.lang.String value8() -> value8
     java.lang.String value9() -> value9
 com.android.jack.shrob.test016.jack.Annot5 -> Nbbch5:
-    java.lang.String value() -> jnyir__
+    java.lang.String value() -> value
 com.android.jack.shrob.test016.jack.Annot -> Nbbch:
-    java.lang.String value() -> jnyir__
+    java.lang.String value() -> value
 com.android.jack.shrob.test016.jack.Annot3 -> Nbbch3:
-    java.lang.String value() -> jnyir__
+    java.lang.String value() -> value
 com.android.jack.shrob.test016.jack.Annot4 -> Nbbch4:
-    java.lang.String value() -> jnyir__
+    java.lang.String value() -> value
 com.android.jack.shrob.test016.jack.Annot2 -> Nbbch2:
-    java.lang.String value() -> jnyir__
+    java.lang.String value() -> value