diff options
| author | delphinemartin <delphinemartin@google.com> | 2014-03-24 17:23:02 +0100 |
|---|---|---|
| committer | delphinemartin <delphinemartin@google.com> | 2014-06-06 09:47:20 +0200 |
| commit | dacf75175072387c9980d7f880fc37c33f9fed00 (patch) | |
| tree | 67d73fd1f82e951a3e899cfcdb0800646c858892 /jack-tests/tests/com/android | |
| parent | 0d6b58342fb9362dea7f406a6f6a7878b63b0057 (diff) | |
| download | toolchain_jack-dacf75175072387c9980d7f880fc37c33f9fed00.zip toolchain_jack-dacf75175072387c9980d7f880fc37c33f9fed00.tar.gz toolchain_jack-dacf75175072387c9980d7f880fc37c33f9fed00.tar.bz2 | |
Added possibility to search the hierarchy while finding seeds.
When a class specification is matched and we are searching
for member matching the member specification, we now have
the possibility (using a property) to search also in the superclasses
of the matches class.
This patch does not change Shrinking and obfuscation behavior but
only the printing of seeds.
Bug: 12026809
Change-Id: I93699475e47f9de2501c463c8d96635b26e97853
Diffstat (limited to 'jack-tests/tests/com/android')
10 files changed, 66 insertions, 0 deletions
diff --git a/jack-tests/tests/com/android/jack/shrob/test030/refsSeed/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test030/refsSeed/expected-001.txt index 0f7bbb2..2543990 100644 --- a/jack-tests/tests/com/android/jack/shrob/test030/refsSeed/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test030/refsSeed/expected-001.txt @@ -1,7 +1,13 @@ com.android.jack.shrob.test030.jack.A: A() com.android.jack.shrob.test030.jack.A: int m() +com.android.jack.shrob.test030.jack.A: void <clinit>() +com.android.jack.shrob.test030.jack.A: void $init() com.android.jack.shrob.test030.jack.B com.android.jack.shrob.test030.jack.B: B() +com.android.jack.shrob.test030.jack.B: void <clinit>() +com.android.jack.shrob.test030.jack.B: void $init() com.android.jack.shrob.test030.jack.Kept com.android.jack.shrob.test030.jack.Kept: Kept() com.android.jack.shrob.test030.jack.Kept: int kept(com.android.jack.shrob.test030.jack.I) +com.android.jack.shrob.test030.jack.Kept: void <clinit>() +com.android.jack.shrob.test030.jack.Kept: void $init() diff --git a/jack-tests/tests/com/android/jack/shrob/test031/proguard.flags002 b/jack-tests/tests/com/android/jack/shrob/test031/proguard.flags002 new file mode 100644 index 0000000..3b311ba --- /dev/null +++ b/jack-tests/tests/com/android/jack/shrob/test031/proguard.flags002 @@ -0,0 +1,3 @@ +-keep class **.B { + *** m(); +}
\ No newline at end of file diff --git a/jack-tests/tests/com/android/jack/shrob/test031/proguard.flags002.mapping b/jack-tests/tests/com/android/jack/shrob/test031/proguard.flags002.mapping new file mode 100644 index 0000000..6a76a4c --- /dev/null +++ b/jack-tests/tests/com/android/jack/shrob/test031/proguard.flags002.mapping @@ -0,0 +1,16 @@ +com.android.jack.shrob.test031.jack.E -> com.android.jack.shrob.test031.jack.E: + void <init>() -> <init> +com.android.jack.shrob.test031.jack.Kept -> com.android.jack.shrob.test031.jack.Kept: + void <init>() -> <init> + int kept(com.android.jack.shrob.test031.jack.I) -> kept +com.android.jack.shrob.test031.jack.I -> com.android.jack.shrob.test031.jack.a: + int m() -> a +com.android.jack.shrob.test031.jack.F -> com.android.jack.shrob.test031.jack.b: + void <init>() -> <init> +com.android.jack.shrob.test031.jack.B -> com.android.jack.shrob.test031.jack.B: + void <init>() -> <init> +com.android.jack.shrob.test031.jack.D -> com.android.jack.shrob.test031.jack.D: + void <init>() -> <init> +com.android.jack.shrob.test031.jack.A -> com.android.jack.shrob.test031.jack.c: + void <init>() -> <init> + int m() -> a diff --git a/jack-tests/tests/com/android/jack/shrob/test031/refsFlattenPackage/expected-002.txt b/jack-tests/tests/com/android/jack/shrob/test031/refsFlattenPackage/expected-002.txt new file mode 100644 index 0000000..0b53802 --- /dev/null +++ b/jack-tests/tests/com/android/jack/shrob/test031/refsFlattenPackage/expected-002.txt @@ -0,0 +1,6 @@ +com.android.jack.shrob.test031.jack.F -> com.android.jack.shrob.test031.jack.S: + void <init>() -> <init> +com.android.jack.shrob.test031.jack.B -> com.android.jack.shrob.test031.jack.B: + void <init>() -> <init> +com.android.jack.shrob.test031.jack.A -> com.android.jack.shrob.test031.jack.N: + void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithMapping/expected-002.txt b/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithMapping/expected-002.txt new file mode 100644 index 0000000..4f2a835 --- /dev/null +++ b/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithMapping/expected-002.txt @@ -0,0 +1,6 @@ +com.android.jack.shrob.test031.jack.F -> com.android.jack.shrob.test031.jack.b: + void <init>() -> <init> +com.android.jack.shrob.test031.jack.B -> com.android.jack.shrob.test031.jack.B: + void <init>() -> <init> +com.android.jack.shrob.test031.jack.A -> com.android.jack.shrob.test031.jack.c: + void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithoutMapping/expected-002.txt b/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithoutMapping/expected-002.txt new file mode 100644 index 0000000..0b53802 --- /dev/null +++ b/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithoutMapping/expected-002.txt @@ -0,0 +1,6 @@ +com.android.jack.shrob.test031.jack.F -> com.android.jack.shrob.test031.jack.S: + void <init>() -> <init> +com.android.jack.shrob.test031.jack.B -> com.android.jack.shrob.test031.jack.B: + void <init>() -> <init> +com.android.jack.shrob.test031.jack.A -> com.android.jack.shrob.test031.jack.N: + void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test031/refsRepackageClasses/expected-002.txt b/jack-tests/tests/com/android/jack/shrob/test031/refsRepackageClasses/expected-002.txt new file mode 100644 index 0000000..42e2adf --- /dev/null +++ b/jack-tests/tests/com/android/jack/shrob/test031/refsRepackageClasses/expected-002.txt @@ -0,0 +1,6 @@ +com.android.jack.shrob.test031.jack.F -> S: + void <init>() -> <init> +com.android.jack.shrob.test031.jack.B -> com.android.jack.shrob.test031.jack.B: + void <init>() -> <init> +com.android.jack.shrob.test031.jack.A -> N: + void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test031/refsSeed/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test031/refsSeed/expected-001.txt index a3d1040..b66efe3 100644 --- a/jack-tests/tests/com/android/jack/shrob/test031/refsSeed/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test031/refsSeed/expected-001.txt @@ -1,11 +1,19 @@ com.android.jack.shrob.test031.jack.A: A() com.android.jack.shrob.test031.jack.A: int m() +com.android.jack.shrob.test031.jack.A: void <clinit>() +com.android.jack.shrob.test031.jack.A: void $init() com.android.jack.shrob.test031.jack.B com.android.jack.shrob.test031.jack.B: B() +com.android.jack.shrob.test031.jack.B: void <clinit>() +com.android.jack.shrob.test031.jack.B: void $init() com.android.jack.shrob.test031.jack.D com.android.jack.shrob.test031.jack.E com.android.jack.shrob.test031.jack.F: F() com.android.jack.shrob.test031.jack.F: int m() +com.android.jack.shrob.test031.jack.F: void <clinit>() +com.android.jack.shrob.test031.jack.F: void $init() com.android.jack.shrob.test031.jack.Kept com.android.jack.shrob.test031.jack.Kept: Kept() com.android.jack.shrob.test031.jack.Kept: int kept(com.android.jack.shrob.test031.jack.I) +com.android.jack.shrob.test031.jack.Kept: void <clinit>() +com.android.jack.shrob.test031.jack.Kept: void $init() diff --git a/jack-tests/tests/com/android/jack/shrob/test031/refsSeed/expected-002.txt b/jack-tests/tests/com/android/jack/shrob/test031/refsSeed/expected-002.txt new file mode 100644 index 0000000..75c4320 --- /dev/null +++ b/jack-tests/tests/com/android/jack/shrob/test031/refsSeed/expected-002.txt @@ -0,0 +1,3 @@ +com.android.jack.shrob.test031.jack.A: int m() +com.android.jack.shrob.test031.jack.B +com.android.jack.shrob.test031.jack.F: int m()
\ No newline at end of file diff --git a/jack-tests/tests/com/android/jack/shrob/test031/refsShrinking/expected-002.txt b/jack-tests/tests/com/android/jack/shrob/test031/refsShrinking/expected-002.txt new file mode 100644 index 0000000..c09949f --- /dev/null +++ b/jack-tests/tests/com/android/jack/shrob/test031/refsShrinking/expected-002.txt @@ -0,0 +1,6 @@ +Lcom/android/jack/shrob/test031/jack/F;: +<init>()V +Lcom/android/jack/shrob/test031/jack/B;: +<init>()V +Lcom/android/jack/shrob/test031/jack/A;: +<init>()V
\ No newline at end of file |