Added missing mappings and listings parts in test040

This should fix test-jack-long

Change-Id: Ib538187d3fa28dd83d72a0b591cc131f9490e826

6 files changed, 79 insertions, 0 deletions

diff --git a/jack-tests/tests/com/android/jack/shrob/test040/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test040/proguard.flags001.mapping
index 150e01b..73fe046 100644
--- a/jack-tests/tests/com/android/jack/shrob/test040/proguard.flags001.mapping
+++ b/jack-tests/tests/com/android/jack/shrob/test040/proguard.flags001.mapping
@@ -8,6 +8,15 @@ com.android.jack.shrob.test040.jack.ReferencedByAnnotationWithOtherReferences$1
     com.android.jack.shrob.test040.jack.ReferencedByEnum a -> renamedA
 com.android.jack.shrob.test040.jack.ReferencedByAnnotationWithOtherReferences$2 -> com.android.jack.shrob.test040.jack.RenamedReferencedByAnnotationWithOtherReferences$2:
     com.android.jack.shrob.test040.jack.ReferencedByEnum b -> renamedB
+com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation -> com.android.jack.shrob.test040.jack.RenamedReferencedByClassInAnnotation:
+    com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation A -> renamedA
+    com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation B -> renamedB
+    com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation[] $VALUES -> renamed$VALUES
+    com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation[] values() -> renamedValues
+com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation$1 -> com.android.jack.shrob.test040.jack.RenamedReferencedByClassInAnnotation$1:
+    com.android.jack.shrob.test040.jack.ReferencedByEnum a -> renamedA
+com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation$2 -> com.android.jack.shrob.test040.jack.RenamedReferencedByClassInAnnotation$2:
+    com.android.jack.shrob.test040.jack.ReferencedByEnum b -> renamedB
 com.android.jack.shrob.test040.jack.AnnotationWithClass -> com.android.jack.shrob.test040.jack.RenamedAnnotationWithClass:
     java.lang.Class value() -> renamedValue
 com.android.jack.shrob.test040.jack.AnnotationWithEnum2 -> com.android.jack.shrob.test040.jack.RenamedAnnotationWithEnum2:
diff --git a/jack-tests/tests/com/android/jack/shrob/test040/refsFlattenPackage/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test040/refsFlattenPackage/expected-001.txt
index cf16126..4759ae2 100644
--- a/jack-tests/tests/com/android/jack/shrob/test040/refsFlattenPackage/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test040/refsFlattenPackage/expected-001.txt
@@ -16,6 +16,20 @@ com.android.jack.shrob.test040.jack.ReferencedByAnnotationWithOtherReferences$1
 com.android.jack.shrob.test040.jack.ReferencedByAnnotationWithOtherReferences$2 -> com.android.jack.shrob.test040.jack.FrsrfrbprqOmNbbchnhvcbKvhuChurfFrsrfrbprg$2:
     com.android.jack.shrob.test040.jack.ReferencedByEnum b -> o:Ypcz/nbqfcvq/wnpx/gufco/hrgh040/wnpx/SfgfsfodfeCzFovn;
     void <init>(java.lang.String,int) -> <init>
+com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation -> com.android.jack.shrob.test040.jack.FrsrfrbprqOmPynggVbNbbchnhvcb:
+    com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation A -> N:Ypcz/nbqfcvq/wnpx/gufco/hrgh040/wnpx/SfgfsfodfeCzDmbttJoBoopubujpo;
+    com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation B -> O:Ypcz/nbqfcvq/wnpx/gufco/hrgh040/wnpx/SfgfsfodfeCzDmbttJoBoopubujpo;
+    com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation[] $VALUES -> $JNYIRG:[Ypcz/nbqfcvq/wnpx/gufco/hrgh040/wnpx/SfgfsfodfeCzDmbttJoBoopubujpo;
+    void <init>(java.lang.String,int) -> <init>
+    com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation[] values() -> jnyirg__
+    void <clinit>() -> <clinit>
+    void <init>(java.lang.String,int,com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation) -> <init>
+com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation$1 -> com.android.jack.shrob.test040.jack.FrsrfrbprqOmPynggVbNbbchnhvcb$1:
+    com.android.jack.shrob.test040.jack.ReferencedByEnum a -> n:Ypcz/nbqfcvq/wnpx/gufco/hrgh040/wnpx/SfgfsfodfeCzFovn;
+    void <init>(java.lang.String,int) -> <init>
+com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation$2 -> com.android.jack.shrob.test040.jack.FrsrfrbprqOmPynggVbNbbchnhvcb$2:
+    com.android.jack.shrob.test040.jack.ReferencedByEnum b -> o:Ypcz/nbqfcvq/wnpx/gufco/hrgh040/wnpx/SfgfsfodfeCzFovn;
+    void <init>(java.lang.String,int) -> <init>
 com.android.jack.shrob.test040.jack.Annotated -> com.android.jack.shrob.test040.jack.Annotated:
     void <init>() -> <init>
 com.android.jack.shrob.test040.jack.AnnotationWithClass -> com.android.jack.shrob.test040.jack.NbbchnhvcbKvhuPyngg:
diff --git a/jack-tests/tests/com/android/jack/shrob/test040/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test040/refsObfuscationWithMapping/expected-001.txt
index ae6624a..cb356ff 100644
--- a/jack-tests/tests/com/android/jack/shrob/test040/refsObfuscationWithMapping/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test040/refsObfuscationWithMapping/expected-001.txt
@@ -16,6 +16,20 @@ com.android.jack.shrob.test040.jack.ReferencedByAnnotationWithOtherReferences$1
 com.android.jack.shrob.test040.jack.ReferencedByAnnotationWithOtherReferences$2 -> com.android.jack.shrob.test040.jack.RenamedReferencedByAnnotationWithOtherReferences$2:
     com.android.jack.shrob.test040.jack.ReferencedByEnum b -> renamedB
     void <init>(java.lang.String,int) -> <init>
+com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation -> com.android.jack.shrob.test040.jack.RenamedReferencedByClassInAnnotation:
+    com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation A -> renamedA
+    com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation B -> renamedB
+    com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation[] $VALUES -> renamed$VALUES
+    void <init>(java.lang.String,int) -> <init>
+    com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation[] values() -> renamedValues
+    void <clinit>() -> <clinit>
+    void <init>(java.lang.String,int,com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation) -> <init>
+com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation$1 -> com.android.jack.shrob.test040.jack.RenamedReferencedByClassInAnnotation$1:
+    com.android.jack.shrob.test040.jack.ReferencedByEnum a -> renamedA
+    void <init>(java.lang.String,int) -> <init>
+com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation$2 -> com.android.jack.shrob.test040.jack.RenamedReferencedByClassInAnnotation$2:
+    com.android.jack.shrob.test040.jack.ReferencedByEnum b -> renamedB
+    void <init>(java.lang.String,int) -> <init>
 com.android.jack.shrob.test040.jack.Annotated -> com.android.jack.shrob.test040.jack.Annotated:
     void <init>() -> <init>
 com.android.jack.shrob.test040.jack.AnnotationWithClass -> com.android.jack.shrob.test040.jack.RenamedAnnotationWithClass:
diff --git a/jack-tests/tests/com/android/jack/shrob/test040/refsObfuscationWithoutMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test040/refsObfuscationWithoutMapping/expected-001.txt
index cf16126..4759ae2 100644
--- a/jack-tests/tests/com/android/jack/shrob/test040/refsObfuscationWithoutMapping/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test040/refsObfuscationWithoutMapping/expected-001.txt
@@ -16,6 +16,20 @@ com.android.jack.shrob.test040.jack.ReferencedByAnnotationWithOtherReferences$1
 com.android.jack.shrob.test040.jack.ReferencedByAnnotationWithOtherReferences$2 -> com.android.jack.shrob.test040.jack.FrsrfrbprqOmNbbchnhvcbKvhuChurfFrsrfrbprg$2:
     com.android.jack.shrob.test040.jack.ReferencedByEnum b -> o:Ypcz/nbqfcvq/wnpx/gufco/hrgh040/wnpx/SfgfsfodfeCzFovn;
     void <init>(java.lang.String,int) -> <init>
+com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation -> com.android.jack.shrob.test040.jack.FrsrfrbprqOmPynggVbNbbchnhvcb:
+    com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation A -> N:Ypcz/nbqfcvq/wnpx/gufco/hrgh040/wnpx/SfgfsfodfeCzDmbttJoBoopubujpo;
+    com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation B -> O:Ypcz/nbqfcvq/wnpx/gufco/hrgh040/wnpx/SfgfsfodfeCzDmbttJoBoopubujpo;
+    com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation[] $VALUES -> $JNYIRG:[Ypcz/nbqfcvq/wnpx/gufco/hrgh040/wnpx/SfgfsfodfeCzDmbttJoBoopubujpo;
+    void <init>(java.lang.String,int) -> <init>
+    com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation[] values() -> jnyirg__
+    void <clinit>() -> <clinit>
+    void <init>(java.lang.String,int,com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation) -> <init>
+com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation$1 -> com.android.jack.shrob.test040.jack.FrsrfrbprqOmPynggVbNbbchnhvcb$1:
+    com.android.jack.shrob.test040.jack.ReferencedByEnum a -> n:Ypcz/nbqfcvq/wnpx/gufco/hrgh040/wnpx/SfgfsfodfeCzFovn;
+    void <init>(java.lang.String,int) -> <init>
+com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation$2 -> com.android.jack.shrob.test040.jack.FrsrfrbprqOmPynggVbNbbchnhvcb$2:
+    com.android.jack.shrob.test040.jack.ReferencedByEnum b -> o:Ypcz/nbqfcvq/wnpx/gufco/hrgh040/wnpx/SfgfsfodfeCzFovn;
+    void <init>(java.lang.String,int) -> <init>
 com.android.jack.shrob.test040.jack.Annotated -> com.android.jack.shrob.test040.jack.Annotated:
     void <init>() -> <init>
 com.android.jack.shrob.test040.jack.AnnotationWithClass -> com.android.jack.shrob.test040.jack.NbbchnhvcbKvhuPyngg:
diff --git a/jack-tests/tests/com/android/jack/shrob/test040/refsRepackageClasses/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test040/refsRepackageClasses/expected-001.txt
index bd2b25c..b16385d 100644
--- a/jack-tests/tests/com/android/jack/shrob/test040/refsRepackageClasses/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test040/refsRepackageClasses/expected-001.txt
@@ -16,6 +16,20 @@ com.android.jack.shrob.test040.jack.ReferencedByAnnotationWithOtherReferences$1
 com.android.jack.shrob.test040.jack.ReferencedByAnnotationWithOtherReferences$2 -> FrsrfrbprqOmNbbchnhvcbKvhuChurfFrsrfrbprg$2:
     com.android.jack.shrob.test040.jack.ReferencedByEnum b -> o:Ypcz/nbqfcvq/wnpx/gufco/hrgh040/wnpx/SfgfsfodfeCzFovn;
     void <init>(java.lang.String,int) -> <init>
+com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation -> FrsrfrbprqOmPynggVbNbbchnhvcb:
+    com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation A -> N:Ypcz/nbqfcvq/wnpx/gufco/hrgh040/wnpx/SfgfsfodfeCzDmbttJoBoopubujpo;
+    com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation B -> O:Ypcz/nbqfcvq/wnpx/gufco/hrgh040/wnpx/SfgfsfodfeCzDmbttJoBoopubujpo;
+    com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation[] $VALUES -> $JNYIRG:[Ypcz/nbqfcvq/wnpx/gufco/hrgh040/wnpx/SfgfsfodfeCzDmbttJoBoopubujpo;
+    void <init>(java.lang.String,int) -> <init>
+    com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation[] values() -> jnyirg__
+    void <clinit>() -> <clinit>
+    void <init>(java.lang.String,int,com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation) -> <init>
+com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation$1 -> FrsrfrbprqOmPynggVbNbbchnhvcb$1:
+    com.android.jack.shrob.test040.jack.ReferencedByEnum a -> n:Ypcz/nbqfcvq/wnpx/gufco/hrgh040/wnpx/SfgfsfodfeCzFovn;
+    void <init>(java.lang.String,int) -> <init>
+com.android.jack.shrob.test040.jack.ReferencedByClassInAnnotation$2 -> FrsrfrbprqOmPynggVbNbbchnhvcb$2:
+    com.android.jack.shrob.test040.jack.ReferencedByEnum b -> o:Ypcz/nbqfcvq/wnpx/gufco/hrgh040/wnpx/SfgfsfodfeCzFovn;
+    void <init>(java.lang.String,int) -> <init>
 com.android.jack.shrob.test040.jack.Annotated -> com.android.jack.shrob.test040.jack.Annotated:
     void <init>() -> <init>
 com.android.jack.shrob.test040.jack.AnnotationWithClass -> NbbchnhvcbKvhuPyngg:
diff --git a/jack-tests/tests/com/android/jack/shrob/test040/refsShrinking/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test040/refsShrinking/expected-001.txt
index 5d5f76b..4eadf65 100644
--- a/jack-tests/tests/com/android/jack/shrob/test040/refsShrinking/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test040/refsShrinking/expected-001.txt
@@ -16,6 +16,20 @@ Lcom/android/jack/shrob/test040/jack/ReferencedByEnum; a
 Lcom/android/jack/shrob/test040/jack/ReferencedByAnnotationWithOtherReferences$2;:
 Lcom/android/jack/shrob/test040/jack/ReferencedByEnum; b
 <init>(Ljava/lang/String;I)V
+Lcom/android/jack/shrob/test040/jack/ReferencedByClassInAnnotation;:
+Lcom/android/jack/shrob/test040/jack/ReferencedByClassInAnnotation; A
+Lcom/android/jack/shrob/test040/jack/ReferencedByClassInAnnotation; B
+[Lcom/android/jack/shrob/test040/jack/ReferencedByClassInAnnotation; $VALUES
+<init>(Ljava/lang/String;I)V
+values()[Lcom/android/jack/shrob/test040/jack/ReferencedByClassInAnnotation;
+<clinit>()V
+<init>(Ljava/lang/String;ILcom/android/jack/shrob/test040/jack/ReferencedByClassInAnnotation;)V
+Lcom/android/jack/shrob/test040/jack/ReferencedByClassInAnnotation$1;:
+Lcom/android/jack/shrob/test040/jack/ReferencedByEnum; a
+<init>(Ljava/lang/String;I)V
+Lcom/android/jack/shrob/test040/jack/ReferencedByClassInAnnotation$2;:
+Lcom/android/jack/shrob/test040/jack/ReferencedByEnum; b
+<init>(Ljava/lang/String;I)V
 Lcom/android/jack/shrob/test040/jack/Annotated;:
 <init>()V
 Lcom/android/jack/shrob/test040/jack/AnnotationWithClass;: