diff options
| author | Yohann Roussel <yroussel@google.com> | 2014-04-07 11:55:23 +0200 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2014-04-07 11:55:23 +0200 |
| commit | 07a55f2c401c7bab42db8b1fb83abe3f980d364f (patch) | |
| tree | a9937e2a054922e0288300d0c16d83742538183f /jack-tests | |
| parent | de9fa866925ccc0eac235184b7fb122e333e223e (diff) | |
| download | toolchain_jack-07a55f2c401c7bab42db8b1fb83abe3f980d364f.zip toolchain_jack-07a55f2c401c7bab42db8b1fb83abe3f980d364f.tar.gz toolchain_jack-07a55f2c401c7bab42db8b1fb83abe3f980d364f.tar.bz2 | |
Initial Jack import part 2.
Change-Id: Ic439604a1f030700d9049800fbf62422e0004d35
Diffstat (limited to 'jack-tests')
160 files changed, 831 insertions, 846 deletions
diff --git a/jack-tests/Android.mk b/jack-tests/Android.mk index 7b358a3..bfefef6 100644 --- a/jack-tests/Android.mk +++ b/jack-tests/Android.mk @@ -59,6 +59,7 @@ $(call declare-test-with-name,annotation/test009) $(call declare-test-with-name,arithmetic/test001) $(call declare-test-with-name,arithmetic/test002) $(call declare-test-with-name,arithmetic/test003) +$(call declare-test-with-name,arithmetic/test004) # Array $(call declare-test-with-name,array/test001) diff --git a/jack-tests/tests/com/android/jack/arithmetic/test004/dx/Tests.java b/jack-tests/tests/com/android/jack/arithmetic/test004/dx/Tests.java new file mode 100644 index 0000000..b3b13aa --- /dev/null +++ b/jack-tests/tests/com/android/jack/arithmetic/test004/dx/Tests.java @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.jack.arithmetic.test004.dx; + +import junit.framework.Assert; + +import org.junit.Test; + +import com.android.jack.arithmetic.test004.jack.ArithmeticWithoutValue; + +/** + * Arithmetic with unary operator. + */ +public class Tests { + + @Test + public void test1() { + Assert.assertEquals(2, ArithmeticWithoutValue.add1(1, 1)); + Assert.assertEquals(2, ArithmeticWithoutValue.add2(1, 1)); + Assert.assertEquals(0, ArithmeticWithoutValue.add3(1, 1)); + } + +} diff --git a/jack-tests/tests/com/android/jack/arithmetic/test004/jack/ArithmeticWithoutValue.java b/jack-tests/tests/com/android/jack/arithmetic/test004/jack/ArithmeticWithoutValue.java new file mode 100644 index 0000000..27d032b --- /dev/null +++ b/jack-tests/tests/com/android/jack/arithmetic/test004/jack/ArithmeticWithoutValue.java @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.jack.arithmetic.test004.jack; + +/** + * Arithmetic with unary operator. + */ +public class ArithmeticWithoutValue { + + public static int add1(int a, int b) { + return a + - + - + b; + } + + public static int add2(int a, int b) { + return a + - + - + + b; + } + + public static int add3(int a, int b) { + return a + - + - - b; + } +} diff --git a/jack-tests/tests/com/android/jack/shrob/test027/jack/A.java b/jack-tests/tests/com/android/jack/frontend/test001/jack/missing/MissingObject.java index 5a2caba..db9f020 100644 --- a/jack-tests/tests/com/android/jack/shrob/test027/jack/A.java +++ b/jack-tests/tests/com/android/jack/frontend/test001/jack/missing/MissingObject.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 The Android Open Source Project + * Copyright (C) 2014 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,8 @@ * limitations under the License. */ -package com.android.jack.shrob.test027.jack; +package com.android.jack.frontend.test001.jack.missing; -public class A { +public class MissingObject { } diff --git a/jack-tests/tests/com/android/jack/frontend/test001/jack/sub2/SuperClass.java b/jack-tests/tests/com/android/jack/frontend/test001/jack/sub2/SuperClass.java new file mode 100644 index 0000000..4571d8d --- /dev/null +++ b/jack-tests/tests/com/android/jack/frontend/test001/jack/sub2/SuperClass.java @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.jack.frontend.test001.jack.sub2; + +import com.android.jack.frontend.test001.jack.missing.MissingObject; + +public class SuperClass extends TopClass { + + @Override + MissingObject get() { + return null; + } + +} diff --git a/jack-tests/tests/com/android/jack/shrob/test027/lib/ForName.java b/jack-tests/tests/com/android/jack/frontend/test001/jack/sub2/TopClass.java index 2b797c9..fd3ae6c 100644 --- a/jack-tests/tests/com/android/jack/shrob/test027/lib/ForName.java +++ b/jack-tests/tests/com/android/jack/frontend/test001/jack/sub2/TopClass.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 The Android Open Source Project + * Copyright (C) 2014 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,12 @@ * limitations under the License. */ -package com.android.jack.shrob.test027.lib; +package com.android.jack.frontend.test001.jack.sub2; -public class ForName { - public static Class<?> keptMethod() throws ClassNotFoundException { - return Class.forName("com.android.jack.shrob.test027.jack.A"); +public class TopClass { + + Object get() { + return null; } + } diff --git a/jack-tests/tests/com/android/jack/frontend/test001/jack/test/SubClass.java b/jack-tests/tests/com/android/jack/frontend/test001/jack/test/SubClass.java new file mode 100644 index 0000000..518837e --- /dev/null +++ b/jack-tests/tests/com/android/jack/frontend/test001/jack/test/SubClass.java @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.jack.frontend.test001.jack.test; + +import com.android.jack.frontend.test001.jack.sub2.SuperClass; + +public class SubClass extends SuperClass { + +} diff --git a/jack-tests/tests/com/android/jack/inner/test026/jack/D.java b/jack-tests/tests/com/android/jack/inner/test026/jack/D.java index 5edfc73..e4178b9 100644 --- a/jack-tests/tests/com/android/jack/inner/test026/jack/D.java +++ b/jack-tests/tests/com/android/jack/inner/test026/jack/D.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.android.jack.inner.test026.jack; import com.android.jack.inner.test026.jack.pkg.C; diff --git a/jack-tests/tests/com/android/jack/jarjar/test001/jack/DummyAnnot.java b/jack-tests/tests/com/android/jack/jarjar/test001/jack/DummyAnnot.java index bbf8017..4134bec 100644 --- a/jack-tests/tests/com/android/jack/jarjar/test001/jack/DummyAnnot.java +++ b/jack-tests/tests/com/android/jack/jarjar/test001/jack/DummyAnnot.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.android.jack.jarjar.test001.jack; import java.lang.annotation.Retention; diff --git a/jack-tests/tests/com/android/jack/resource/test001/jack/IrrelevantForTest.java b/jack-tests/tests/com/android/jack/resource/test001/jack/IrrelevantForTest.java new file mode 100644 index 0000000..fc67d00 --- /dev/null +++ b/jack-tests/tests/com/android/jack/resource/test001/jack/IrrelevantForTest.java @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.jack.resource.test001.jack; + +/** + * This class is irrelevant for the test, since what we test here is the handling of resources. + */ +public class IrrelevantForTest { + + public int getInt() { + return 4; + } + +} diff --git a/jack-tests/tests/com/android/jack/resource/test001/jack/Resource1 b/jack-tests/tests/com/android/jack/resource/test001/jack/Resource1 new file mode 100644 index 0000000..b98ccd9 --- /dev/null +++ b/jack-tests/tests/com/android/jack/resource/test001/jack/Resource1 @@ -0,0 +1 @@ +Res1 diff --git a/jack-tests/tests/com/android/jack/resource/test001/jack/Resource2 b/jack-tests/tests/com/android/jack/resource/test001/jack/Resource2 new file mode 100644 index 0000000..1bcdbc0 --- /dev/null +++ b/jack-tests/tests/com/android/jack/resource/test001/jack/Resource2 @@ -0,0 +1 @@ +Res2 diff --git a/jack-tests/tests/com/android/jack/resource/test001/jack/pack/Resource3 b/jack-tests/tests/com/android/jack/resource/test001/jack/pack/Resource3 new file mode 100644 index 0000000..d0da24e --- /dev/null +++ b/jack-tests/tests/com/android/jack/resource/test001/jack/pack/Resource3 @@ -0,0 +1 @@ +Res3 diff --git a/jack-tests/tests/com/android/jack/resource/test001/jack/pack/Resource4 b/jack-tests/tests/com/android/jack/resource/test001/jack/pack/Resource4 new file mode 100644 index 0000000..cf38257 --- /dev/null +++ b/jack-tests/tests/com/android/jack/resource/test001/jack/pack/Resource4 @@ -0,0 +1 @@ +Res4 diff --git a/jack-tests/tests/com/android/jack/resource/test001/jack/proguard.flags b/jack-tests/tests/com/android/jack/resource/test001/jack/proguard.flags new file mode 100644 index 0000000..a8d845e --- /dev/null +++ b/jack-tests/tests/com/android/jack/resource/test001/jack/proguard.flags @@ -0,0 +1 @@ +-keep class com.android.jack.resource.test001.jack.IrrelevantForTest diff --git a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags001.mapping index 21fc0d4..dd71fd9 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags001.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags001.mapping @@ -1,3 +1,2 @@ -com.android.jack.shrob.test001.jack.A -> com.android.jack.shrob.test001.jack.A: -com.android.jack.shrob.test001.jack.C -> com.android.jack.shrob.test001.jack.a: - void m() -> a +com.android.jack.shrob.test001.jack.C -> com.android.jack.shrob.test001.jack.RenamedC: + void m() -> renamedM
\ No newline at end of file diff --git a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags002.mapping b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags002.mapping index df84b16..0d80a32 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags002.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags002.mapping @@ -1,4 +1,2 @@ -com.android.jack.shrob.test001.jack.A -> com.android.jack.shrob.test001.jack.A: - void privateFunc() -> privateFunc -com.android.jack.shrob.test001.jack.C -> com.android.jack.shrob.test001.jack.a: - void m() -> a +com.android.jack.shrob.test001.jack.C -> com.android.jack.shrob.test001.jack.RenamedC: + void m() -> renamedM diff --git a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags003.mapping b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags003.mapping index 535ddb9..dd71fd9 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags003.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags003.mapping @@ -1,4 +1,2 @@ -com.android.jack.shrob.test001.jack.A -> com.android.jack.shrob.test001.jack.A: - void m() -> m -com.android.jack.shrob.test001.jack.C -> com.android.jack.shrob.test001.jack.a: - void m() -> a +com.android.jack.shrob.test001.jack.C -> com.android.jack.shrob.test001.jack.RenamedC: + void m() -> renamedM
\ No newline at end of file diff --git a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags004.mapping b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags004.mapping index cc3053b..963fef8 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags004.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags004.mapping @@ -1,3 +1,2 @@ com.android.jack.shrob.test001.jack.D -> com.android.jack.shrob.test001.jack.D: - void keep() -> a - void main2(java.lang.String[]) -> main2 + void keep() -> renamedKeep
\ No newline at end of file diff --git a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags005.mapping b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags005.mapping index 5a4f462..a8a6e5f 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags005.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags005.mapping @@ -1,5 +1,4 @@ com.android.jack.shrob.test001.jack.D -> com.android.jack.shrob.test001.jack.D: - void keep() -> a - void main(java.lang.String[]) -> main -com.android.jack.shrob.test001.jack.E -> com.android.jack.shrob.test001.jack.a: - void keep() -> a + void keep() -> renamedKeep +com.android.jack.shrob.test001.jack.E -> com.android.jack.shrob.test001.jack.RenamedE: + void keep() -> renamedKeep diff --git a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags005.mapping002 b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags005.mapping002 index 5a4f462..a8a6e5f 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags005.mapping002 +++ b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags005.mapping002 @@ -1,5 +1,4 @@ com.android.jack.shrob.test001.jack.D -> com.android.jack.shrob.test001.jack.D: - void keep() -> a - void main(java.lang.String[]) -> main -com.android.jack.shrob.test001.jack.E -> com.android.jack.shrob.test001.jack.a: - void keep() -> a + void keep() -> renamedKeep +com.android.jack.shrob.test001.jack.E -> com.android.jack.shrob.test001.jack.RenamedE: + void keep() -> renamedKeep diff --git a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags005.mapping003 b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags005.mapping003 index 5a4f462..a8a6e5f 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags005.mapping003 +++ b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags005.mapping003 @@ -1,5 +1,4 @@ com.android.jack.shrob.test001.jack.D -> com.android.jack.shrob.test001.jack.D: - void keep() -> a - void main(java.lang.String[]) -> main -com.android.jack.shrob.test001.jack.E -> com.android.jack.shrob.test001.jack.a: - void keep() -> a + void keep() -> renamedKeep +com.android.jack.shrob.test001.jack.E -> com.android.jack.shrob.test001.jack.RenamedE: + void keep() -> renamedKeep diff --git a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags006.mapping b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags006.mapping index 9723086..060dffb 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags006.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags006.mapping @@ -1,6 +1,5 @@ com.android.jack.shrob.test001.jack.G -> com.android.jack.shrob.test001.jack.G: - void m() -> a - void main(java.lang.String[]) -> main -com.android.jack.shrob.test001.jack.H -> com.android.jack.shrob.test001.jack.a: -com.android.jack.shrob.test001.jack.I -> com.android.jack.shrob.test001.jack.b: - void m() -> a + void m() -> renamedM +com.android.jack.shrob.test001.jack.H -> com.android.jack.shrob.test001.jack.RenamedH: +com.android.jack.shrob.test001.jack.I -> com.android.jack.shrob.test001.jack.RenamedI: + void m() -> renamedM diff --git a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags007.mapping b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags007.mapping deleted file mode 100644 index d1fc58b..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags007.mapping +++ /dev/null @@ -1,2 +0,0 @@ -com.android.jack.shrob.test001.jack.J -> com.android.jack.shrob.test001.jack.J: - int[][][] m3() -> m3 diff --git a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags008.mapping b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags008.mapping index 52aad70..cafefd5 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags008.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags008.mapping @@ -1,3 +1 @@ -com.android.jack.shrob.test001.jack.Reflect -> com.android.jack.shrob.test001.jack.Reflect: - void keep() -> keep -com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.a: +com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.RenamedReflect2: diff --git a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags009.mapping b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags009.mapping index e2fa379..453ed82 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags009.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags009.mapping @@ -1,5 +1,3 @@ -com.android.jack.shrob.test001.jack.Reflect -> com.android.jack.shrob.test001.jack.Reflect: - void keep2() -> keep2 -com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.a: - int fieldPublic -> a - int fieldPrivate -> b +com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.RenamedReflect2: + int fieldPublic -> renamedFieldPublic + int fieldPrivate -> renamedFielPrivate diff --git a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags010.mapping b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags010.mapping index 3570842..17428f7 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags010.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags010.mapping @@ -1,5 +1,3 @@ -com.android.jack.shrob.test001.jack.Reflect -> com.android.jack.shrob.test001.jack.Reflect: - void keep3() -> keep3 -com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.a: - int fieldPublic -> a - int fieldPrivate -> b +com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.RenamedReflect2: + int fieldPublic -> renamedFieldPublic + int fieldPrivate -> renamedFielPrivate
\ No newline at end of file diff --git a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags011.mapping b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags011.mapping index 5d902a5..513bb72 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags011.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags011.mapping @@ -1,6 +1,4 @@ -com.android.jack.shrob.test001.jack.Reflect -> com.android.jack.shrob.test001.jack.Reflect: - void keep4() -> keep4 -com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.a: - void m(com.android.jack.shrob.test001.jack.Reflect2$A) -> a -com.android.jack.shrob.test001.jack.Reflect2$A -> com.android.jack.shrob.test001.jack.b: -com.android.jack.shrob.test001.jack.Reflect2$B -> com.android.jack.shrob.test001.jack.c: +com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.RenamedReflect2: + void m(com.android.jack.shrob.test001.jack.Reflect2$A) -> renamedM +com.android.jack.shrob.test001.jack.Reflect2$A -> com.android.jack.shrob.test001.jack.RenamedReflect2$A: +com.android.jack.shrob.test001.jack.Reflect2$B -> com.android.jack.shrob.test001.jack.RenamedReflect2$B: diff --git a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags012.mapping b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags012.mapping index b474da0..513bb72 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags012.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags012.mapping @@ -1,6 +1,4 @@ -com.android.jack.shrob.test001.jack.Reflect -> com.android.jack.shrob.test001.jack.Reflect: - void keep5() -> keep5 -com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.a: - void m(com.android.jack.shrob.test001.jack.Reflect2$A) -> a -com.android.jack.shrob.test001.jack.Reflect2$A -> com.android.jack.shrob.test001.jack.b: -com.android.jack.shrob.test001.jack.Reflect2$B -> com.android.jack.shrob.test001.jack.c: +com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.RenamedReflect2: + void m(com.android.jack.shrob.test001.jack.Reflect2$A) -> renamedM +com.android.jack.shrob.test001.jack.Reflect2$A -> com.android.jack.shrob.test001.jack.RenamedReflect2$A: +com.android.jack.shrob.test001.jack.Reflect2$B -> com.android.jack.shrob.test001.jack.RenamedReflect2$B: diff --git a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags013.mapping b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags013.mapping deleted file mode 100644 index 822a5dd..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags013.mapping +++ /dev/null @@ -1,2 +0,0 @@ -com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.Reflect2: -com.android.jack.shrob.test001.jack.Reflect2$A -> com.android.jack.shrob.test001.jack.Reflect2$A: diff --git a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags014.mapping b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags014.mapping index 73c80ea..0de1868 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags014.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags014.mapping @@ -1,5 +1,3 @@ -com.android.jack.shrob.test001.jack.Reflect -> com.android.jack.shrob.test001.jack.Reflect: - void keep6() -> keep6 -com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.a: - int fieldPublic -> a - long fieldLong -> b +com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.RenamedReflect2: + int fieldPublic -> renamedFieldPublic + long fieldLong -> renamedFieldLong diff --git a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags015.mapping b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags015.mapping index 33be300..a1c72c9 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags015.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags015.mapping @@ -1,7 +1,5 @@ -com.android.jack.shrob.test001.jack.Reflect -> com.android.jack.shrob.test001.jack.Reflect: - void keep7() -> keep7 -com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.a: - int fieldPublic -> a - long fieldLong -> b - long fieldLong3 -> c - long fieldLong4 -> d +com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.RenamedReflect2: + int fieldPublic -> renamedFieldPublic + long fieldLong -> renamedFieldLong + long fieldLong3 -> renamedFieldLong3 + long fieldLong4 -> renamedFieldLong4 diff --git a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags016.mapping b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags016.mapping index 32dea38..d096156 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags016.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags016.mapping @@ -1,6 +1,5 @@ -com.android.jack.shrob.test001.jack.Reflect -> com.android.jack.shrob.test001.jack.Reflect: - void keep8() -> keep8 -com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.a: - com.android.jack.shrob.test001.jack.Reflect2$A a -> a - com.android.jack.shrob.test001.jack.Reflect2$B b -> b -com.android.jack.shrob.test001.jack.Reflect2$A -> com.android.jack.shrob.test001.jack.b: +com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.RenamedReflect2: + com.android.jack.shrob.test001.jack.Reflect2$A a -> renamedA + com.android.jack.shrob.test001.jack.Reflect2$B b -> renamedB +com.android.jack.shrob.test001.jack.Reflect2$A -> com.android.jack.shrob.test001.jack.RenamedReflect2$A: +com.android.jack.shrob.test001.jack.Reflect2$B -> com.android.jack.shrob.test001.jack.RenamedReflect2$B: diff --git a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags017.mapping b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags017.mapping index 84e1c9b..aec0caf 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags017.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags017.mapping @@ -1,8 +1,7 @@ com.android.jack.shrob.test001.jack.K -> com.android.jack.shrob.test001.jack.K: - int i -> a - int h -> b - int i2 -> c - int j -> d - java.lang.Object o -> e - java.lang.String TAG2 -> f - void keep() -> keep + int i -> renamedI + int h -> renamedH + int i2 -> renamedI2 + int j -> renamedJ + java.lang.Object o -> renamedI + java.lang.String TAG2 -> renamedTAG2
\ No newline at end of file diff --git a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags018.mapping b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags018.mapping deleted file mode 100644 index 52fca62..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags018.mapping +++ /dev/null @@ -1,2 +0,0 @@ -com.android.jack.shrob.test001.jack.L -> com.android.jack.shrob.test001.jack.L: - void onReceive() -> onReceive diff --git a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags019.mapping b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags019.mapping deleted file mode 100644 index 14d06cd..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags019.mapping +++ /dev/null @@ -1,30 +0,0 @@ -com.android.jack.shrob.test001.jack.K -> com.android.jack.shrob.test001.jack.K: - int i -> i - int h -> h - int i2 -> i2 - int j -> j - int i3 -> i3 - java.lang.Object o -> o - java.lang.String TAG -> TAG - java.lang.String TAG2 -> TAG2 - void keep() -> keep -com.android.jack.shrob.test001.jack.L -> com.android.jack.shrob.test001.jack.L: - java.lang.String TAG -> TAG - void onReceive() -> onReceive -com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.Reflect2: - int fieldPublic -> fieldPublic - int fieldPrivate -> fieldPrivate - long fieldLong -> fieldLong - long fieldLong2 -> fieldLong2 - long fieldLong3 -> fieldLong3 - long fieldLong4 -> fieldLong4 - com.android.jack.shrob.test001.jack.Reflect2$A a -> a - com.android.jack.shrob.test001.jack.Reflect2$B b -> b - java.lang.Object c -> c - void calledMethod() -> calledMethod - void m(com.android.jack.shrob.test001.jack.Reflect2$A) -> m - void privateMethod(com.android.jack.shrob.test001.jack.Reflect2$B) -> privateMethod -com.android.jack.shrob.test001.jack.Reflect2$A -> com.android.jack.shrob.test001.jack.Reflect2$A: - com.android.jack.shrob.test001.jack.Reflect2 this$0 -> this$0 -com.android.jack.shrob.test001.jack.Reflect2$B -> com.android.jack.shrob.test001.jack.Reflect2$B: - com.android.jack.shrob.test001.jack.Reflect2 this$0 -> this$0 diff --git a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags020.mapping b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags020.mapping deleted file mode 100644 index 1ba7b92..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags020.mapping +++ /dev/null @@ -1,25 +0,0 @@ -com.android.jack.shrob.test001.jack.K -> com.android.jack.shrob.test001.jack.K: - int i -> i - int h -> h - int i2 -> i2 - int j -> j - int i3 -> i3 - java.lang.Object o -> o - java.lang.String TAG -> TAG - java.lang.String TAG2 -> TAG2 -com.android.jack.shrob.test001.jack.L -> com.android.jack.shrob.test001.jack.L: - java.lang.String TAG -> TAG -com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.Reflect2: - int fieldPublic -> fieldPublic - int fieldPrivate -> fieldPrivate - long fieldLong -> fieldLong - long fieldLong2 -> fieldLong2 - long fieldLong3 -> fieldLong3 - long fieldLong4 -> fieldLong4 - com.android.jack.shrob.test001.jack.Reflect2$A a -> a - com.android.jack.shrob.test001.jack.Reflect2$B b -> b - java.lang.Object c -> c -com.android.jack.shrob.test001.jack.Reflect2$A -> com.android.jack.shrob.test001.jack.Reflect2$A: - com.android.jack.shrob.test001.jack.Reflect2 this$0 -> this$0 -com.android.jack.shrob.test001.jack.Reflect2$B -> com.android.jack.shrob.test001.jack.Reflect2$B: - com.android.jack.shrob.test001.jack.Reflect2 this$0 -> this$0 diff --git a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags021.mapping b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags021.mapping index 48a2db6..ca830b9 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags021.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags021.mapping @@ -1,67 +1,39 @@ -com.android.jack.shrob.test001.jack.A -> com.android.jack.shrob.test001.jack.a: - void m() -> a - void privateFunc() -> b -com.android.jack.shrob.test001.jack.B -> com.android.jack.shrob.test001.jack.b: -com.android.jack.shrob.test001.jack.C -> com.android.jack.shrob.test001.jack.c: - void f() -> a - void m() -> b -com.android.jack.shrob.test001.jack.D -> com.android.jack.shrob.test001.jack.d: - void keep() -> a - void main(java.lang.String[]) -> a - void main2(java.lang.String[]) -> b -com.android.jack.shrob.test001.jack.E -> com.android.jack.shrob.test001.jack.e: - void keep() -> a -com.android.jack.shrob.test001.jack.F -> com.android.jack.shrob.test001.jack.f: - void keep() -> a -com.android.jack.shrob.test001.jack.G -> com.android.jack.shrob.test001.jack.g: - void m() -> a - void main(java.lang.String[]) -> a -com.android.jack.shrob.test001.jack.H -> com.android.jack.shrob.test001.jack.h: -com.android.jack.shrob.test001.jack.I -> com.android.jack.shrob.test001.jack.i: - void m() -> a -com.android.jack.shrob.test001.jack.J -> com.android.jack.shrob.test001.jack.j: - int[][][] m5(int,boolean,long) -> a - int[][][] m3() -> a - int[][] m2() -> b - int[] m1() -> c - int m0() -> d - int[][][] m() -> e +com.android.jack.shrob.test001.jack.E -> com.android.jack.shrob.test001.jack.RenamedE: + void keep() -> renamedKeep +com.android.jack.shrob.test001.jack.I -> com.android.jack.shrob.test001.jack.RenamedI: + void m() -> renamedM +com.android.jack.shrob.test001.jack.H -> com.android.jack.shrob.test001.jack.RenamedH: +com.android.jack.shrob.test001.jack.J -> com.android.jack.shrob.test001.jack.RenamedJ: + int[][][] m() -> renamedM + int m0() -> renamedM0 + int[] m1() -> renamedM1 + int[][] m2() -> renamedM2 + int[][][] m3() -> renamedM3 + int[][][] m5(int,boolean,long) -> renamedM5 +com.android.jack.shrob.test001.jack.F -> com.android.jack.shrob.test001.jack.RenamedF: + void keep() -> renamedKeep +com.android.jack.shrob.test001.jack.B -> com.android.jack.shrob.test001.jack.RenamedB: +com.android.jack.shrob.test001.jack.D -> com.android.jack.shrob.test001.jack.RenamedD: + void keep() -> renamedKeep + void main(java.lang.String[]) -> renamedMain + void main2(java.lang.String[]) -> renamedMain2 +com.android.jack.shrob.test001.jack.G -> com.android.jack.shrob.test001.jack.RenamedG: + void m() -> renamedM + void main(java.lang.String[]) -> renamedMain +com.android.jack.shrob.test001.jack.Reflect -> com.android.jack.shrob.test001.jack.RenamedReflect: + void keep() -> renamedKeep + void keep2() -> renamedKeep2 + void keep3() -> renamedKeep3 + void keep4() -> renamedKeep4 + void keep5() -> renamedKeep5 + void keep6() -> renamedKeep6 + void keep7() -> renamedKeep7 + void keep8() -> renamedKeep8 +com.android.jack.shrob.test001.jack.C -> com.android.jack.shrob.test001.jack.RenamedC: + void f() -> renamedF + void m() -> renamedM +com.android.jack.shrob.test001.jack.A -> com.android.jack.shrob.test001.jack.RenamedA: + void m() -> renamedM + void privateFunc() -> renamedPrivateFunc com.android.jack.shrob.test001.jack.K -> com.android.jack.shrob.test001.jack.K: - int i -> i - int h -> h - int i2 -> i2 - int j -> j - int i3 -> i3 - java.lang.Object o -> o - java.lang.String TAG -> TAG - java.lang.String TAG2 -> TAG2 - void keep() -> a -com.android.jack.shrob.test001.jack.L -> com.android.jack.shrob.test001.jack.L: - java.lang.String TAG -> TAG - void onReceive() -> a -com.android.jack.shrob.test001.jack.Reflect -> com.android.jack.shrob.test001.jack.k: - void keep() -> a - void keep2() -> b - void keep3() -> c - void keep4() -> d - void keep5() -> e - void keep6() -> f - void keep7() -> g - void keep8() -> h -com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.Reflect2: - int fieldPublic -> fieldPublic - int fieldPrivate -> fieldPrivate - long fieldLong -> fieldLong - long fieldLong2 -> fieldLong2 - long fieldLong3 -> fieldLong3 - long fieldLong4 -> fieldLong4 - com.android.jack.shrob.test001.jack.Reflect2$A a -> a - com.android.jack.shrob.test001.jack.Reflect2$B b -> b - java.lang.Object c -> c - void calledMethod() -> a - void m(com.android.jack.shrob.test001.jack.Reflect2$A) -> a - void privateMethod(com.android.jack.shrob.test001.jack.Reflect2$B) -> a -com.android.jack.shrob.test001.jack.Reflect2$A -> com.android.jack.shrob.test001.jack.Reflect2$A: - com.android.jack.shrob.test001.jack.Reflect2 this$0 -> this$0 -com.android.jack.shrob.test001.jack.Reflect2$B -> com.android.jack.shrob.test001.jack.Reflect2$B: - com.android.jack.shrob.test001.jack.Reflect2 this$0 -> this$0 + void keep() -> renamedKeep diff --git a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags022.mapping b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags022.mapping index 44c10d6..0b8ef10 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags022.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test001/proguard.flags022.mapping @@ -1,67 +1,37 @@ -com.android.jack.shrob.test001.jack.A -> com.android.jack.shrob.test001.jack.a: - void m() -> a - void privateFunc() -> b -com.android.jack.shrob.test001.jack.B -> com.android.jack.shrob.test001.jack.b: -com.android.jack.shrob.test001.jack.C -> com.android.jack.shrob.test001.jack.c: - void f() -> a - void m() -> b -com.android.jack.shrob.test001.jack.D -> com.android.jack.shrob.test001.jack.d: - void keep() -> a - void main(java.lang.String[]) -> a - void main2(java.lang.String[]) -> b -com.android.jack.shrob.test001.jack.E -> com.android.jack.shrob.test001.jack.e: - void keep() -> a -com.android.jack.shrob.test001.jack.F -> com.android.jack.shrob.test001.jack.f: - void keep() -> a -com.android.jack.shrob.test001.jack.G -> com.android.jack.shrob.test001.jack.g: - void m() -> a - void main(java.lang.String[]) -> a -com.android.jack.shrob.test001.jack.H -> com.android.jack.shrob.test001.jack.h: -com.android.jack.shrob.test001.jack.I -> com.android.jack.shrob.test001.jack.i: - void m() -> a -com.android.jack.shrob.test001.jack.J -> com.android.jack.shrob.test001.jack.j: - int[][][] m5(int,boolean,long) -> a - int[][][] m3() -> a - int[][] m2() -> b - int[] m1() -> c - int m0() -> d - int[][][] m() -> e -com.android.jack.shrob.test001.jack.K -> com.android.jack.shrob.test001.jack.K: - int i -> i - int h -> h - int i2 -> i2 - int j -> j - int i3 -> i3 - java.lang.Object o -> o - java.lang.String TAG -> TAG - java.lang.String TAG2 -> TAG2 - void keep() -> keep -com.android.jack.shrob.test001.jack.L -> com.android.jack.shrob.test001.jack.L: - java.lang.String TAG -> TAG - void onReceive() -> onReceive -com.android.jack.shrob.test001.jack.Reflect -> com.android.jack.shrob.test001.jack.k: - void keep() -> a - void keep2() -> b - void keep3() -> c - void keep4() -> d - void keep5() -> e - void keep6() -> f - void keep7() -> g - void keep8() -> h -com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.Reflect2: - int fieldPublic -> fieldPublic - int fieldPrivate -> fieldPrivate - long fieldLong -> fieldLong - long fieldLong2 -> fieldLong2 - long fieldLong3 -> fieldLong3 - long fieldLong4 -> fieldLong4 - com.android.jack.shrob.test001.jack.Reflect2$A a -> a - com.android.jack.shrob.test001.jack.Reflect2$B b -> b - java.lang.Object c -> c - void calledMethod() -> calledMethod - void m(com.android.jack.shrob.test001.jack.Reflect2$A) -> m - void privateMethod(com.android.jack.shrob.test001.jack.Reflect2$B) -> privateMethod -com.android.jack.shrob.test001.jack.Reflect2$A -> com.android.jack.shrob.test001.jack.Reflect2$A: - com.android.jack.shrob.test001.jack.Reflect2 this$0 -> this$0 -com.android.jack.shrob.test001.jack.Reflect2$B -> com.android.jack.shrob.test001.jack.Reflect2$B: - com.android.jack.shrob.test001.jack.Reflect2 this$0 -> this$0 +com.android.jack.shrob.test001.jack.E -> com.android.jack.shrob.test001.jack.RenamedE: + void keep() -> renamedKeep +com.android.jack.shrob.test001.jack.I -> com.android.jack.shrob.test001.jack.RenamedI: + void m() -> renamedM +com.android.jack.shrob.test001.jack.H -> com.android.jack.shrob.test001.jack.renamedH: +com.android.jack.shrob.test001.jack.J -> com.android.jack.shrob.test001.jack.renamedJ: + int[][][] m5(int,boolean,long) -> renamedM5 + int[][][] m3() -> renamedM3 + int[][] m2() -> renamedM2 + int[] m1() -> renamedM1 + int m0() -> renamedM0 + int[][][] m() -> renamedM +com.android.jack.shrob.test001.jack.F -> com.android.jack.shrob.test001.jack.RenamedF: + void keep() -> renamedKeep +com.android.jack.shrob.test001.jack.B -> com.android.jack.shrob.test001.jack.RenamedB: +com.android.jack.shrob.test001.jack.D -> com.android.jack.shrob.test001.jack.RenamedD: + void keep() -> renamedKeep + void main(java.lang.String[]) -> renamedMain + void main2(java.lang.String[]) -> renamedMain2 +com.android.jack.shrob.test001.jack.G -> com.android.jack.shrob.test001.jack.RenamedG: + void m() -> renamedM + void main(java.lang.String[]) -> renamedMain +com.android.jack.shrob.test001.jack.Reflect -> com.android.jack.shrob.test001.jack.RenamedReflect: + void keep() -> renamedKeep + void keep2() -> renamedKeep2 + void keep3() -> renamedKeep3 + void keep4() -> renamedKeep4 + void keep5() -> renamedKeep5 + void keep6() -> renamedKeep6 + void keep7() -> renamedKeep7 + void keep8() -> renamedKeep8 +com.android.jack.shrob.test001.jack.C -> com.android.jack.shrob.test001.jack.RenamedC: + void f() -> renamedF + void m() -> renamedM +com.android.jack.shrob.test001.jack.A -> com.android.jack.shrob.test001.jack.RenamedA: + void m() -> renamedM + void privateFunc() -> renamedPrivateFunc diff --git a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-001.txt index 51f1db2..6463a01 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-001.txt @@ -1,6 +1,6 @@ -com.android.jack.shrob.test001.jack.C -> com.android.jack.shrob.test001.jack.a: +com.android.jack.shrob.test001.jack.C -> com.android.jack.shrob.test001.jack.RenamedC: void <init>() -> <init> - void m() -> a + void m() -> renamedM com.android.jack.shrob.test001.jack.A -> com.android.jack.shrob.test001.jack.A: - void <clinit>() -> <clinit> void <init>() -> <init> + void <clinit>() -> <clinit> diff --git a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-002.txt b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-002.txt index b0049fe..f827dd9 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-002.txt +++ b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-002.txt @@ -1,7 +1,7 @@ -com.android.jack.shrob.test001.jack.C -> com.android.jack.shrob.test001.jack.a: +com.android.jack.shrob.test001.jack.C -> com.android.jack.shrob.test001.jack.RenamedC: void <init>() -> <init> - void m() -> a + void m() -> renamedM com.android.jack.shrob.test001.jack.A -> com.android.jack.shrob.test001.jack.A: - void <clinit>() -> <clinit> void <init>() -> <init> void privateFunc() -> privateFunc + void <clinit>() -> <clinit> diff --git a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-003.txt b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-003.txt index acbe6d5..fa2b35a 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-003.txt +++ b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-003.txt @@ -1,8 +1,8 @@ -com.android.jack.shrob.test001.jack.C -> com.android.jack.shrob.test001.jack.a: +com.android.jack.shrob.test001.jack.C -> com.android.jack.shrob.test001.jack.RenamedC: void <init>() -> <init> - void m() -> a + void m() -> renamedM com.android.jack.shrob.test001.jack.A -> com.android.jack.shrob.test001.jack.A: - void <clinit>() -> <clinit> void <init>() -> <init> void <init>(int) -> <init> void m() -> m + void <clinit>() -> <clinit> diff --git a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-004.txt b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-004.txt index 952f08d..4b9187a 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-004.txt +++ b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-004.txt @@ -1,4 +1,4 @@ com.android.jack.shrob.test001.jack.D -> com.android.jack.shrob.test001.jack.D: void <init>() -> <init> - void keep() -> a + void keep() -> renamedKeep void main2(java.lang.String[]) -> main2 diff --git a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-005.txt b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-005.txt index 9882dfa..d2f22ee 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-005.txt +++ b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-005.txt @@ -1,7 +1,7 @@ -com.android.jack.shrob.test001.jack.E -> com.android.jack.shrob.test001.jack.a: +com.android.jack.shrob.test001.jack.E -> com.android.jack.shrob.test001.jack.RenamedE: void <init>() -> <init> - void keep() -> a + void keep() -> renamedKeep com.android.jack.shrob.test001.jack.D -> com.android.jack.shrob.test001.jack.D: void <init>() -> <init> - void keep() -> a + void keep() -> renamedKeep void main(java.lang.String[]) -> main diff --git a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-006.txt b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-006.txt index 8c2943a..5d053cc 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-006.txt +++ b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-006.txt @@ -1,7 +1,7 @@ -com.android.jack.shrob.test001.jack.I -> com.android.jack.shrob.test001.jack.b: - void m() -> a -com.android.jack.shrob.test001.jack.H -> com.android.jack.shrob.test001.jack.a: +com.android.jack.shrob.test001.jack.I -> com.android.jack.shrob.test001.jack.RenamedI: + void m() -> renamedM +com.android.jack.shrob.test001.jack.H -> com.android.jack.shrob.test001.jack.RenamedH: com.android.jack.shrob.test001.jack.G -> com.android.jack.shrob.test001.jack.G: void <init>() -> <init> - void m() -> a + void m() -> renamedM void main(java.lang.String[]) -> main diff --git a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-008.txt b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-008.txt index 0965567..d3a17fc 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-008.txt +++ b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-008.txt @@ -1,5 +1,5 @@ com.android.jack.shrob.test001.jack.Reflect -> com.android.jack.shrob.test001.jack.Reflect: void <init>() -> <init> void keep() -> keep -com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.a: +com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.RenamedReflect2: void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-009.txt b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-009.txt index 23e4011..1350955 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-009.txt +++ b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-009.txt @@ -1,6 +1,6 @@ com.android.jack.shrob.test001.jack.Reflect -> com.android.jack.shrob.test001.jack.Reflect: void <init>() -> <init> void keep2() -> keep2 -com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.a: - int fieldPublic -> a +com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.RenamedReflect2: + int fieldPublic -> renamedFieldPublic void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-010.txt b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-010.txt index 28402c5..1c70c36 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-010.txt +++ b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-010.txt @@ -1,6 +1,6 @@ com.android.jack.shrob.test001.jack.Reflect -> com.android.jack.shrob.test001.jack.Reflect: void <init>() -> <init> void keep3() -> keep3 -com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.a: - int fieldPublic -> a +com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.RenamedReflect2: + int fieldPublic -> renamedFieldPublic void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-011.txt b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-011.txt index 0287a94..8dcc0e0 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-011.txt +++ b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-011.txt @@ -1,8 +1,8 @@ com.android.jack.shrob.test001.jack.Reflect -> com.android.jack.shrob.test001.jack.Reflect: void <init>() -> <init> void keep4() -> keep4 -com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.a: +com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.RenamedReflect2: void <init>() -> <init> - void m(com.android.jack.shrob.test001.jack.Reflect2$A) -> a -com.android.jack.shrob.test001.jack.Reflect2$A -> com.android.jack.shrob.test001.jack.b: -com.android.jack.shrob.test001.jack.Reflect2$B -> com.android.jack.shrob.test001.jack.c: + void m(com.android.jack.shrob.test001.jack.Reflect2$A) -> renamedM +com.android.jack.shrob.test001.jack.Reflect2$A -> com.android.jack.shrob.test001.jack.RenamedReflect2$A: +com.android.jack.shrob.test001.jack.Reflect2$B -> com.android.jack.shrob.test001.jack.RenamedReflect2$B: diff --git a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-012.txt b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-012.txt index c95a035..3810d94 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-012.txt +++ b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-012.txt @@ -1,8 +1,8 @@ com.android.jack.shrob.test001.jack.Reflect -> com.android.jack.shrob.test001.jack.Reflect: void <init>() -> <init> void keep5() -> keep5 -com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.a: +com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.RenamedReflect2: void <init>() -> <init> - void m(com.android.jack.shrob.test001.jack.Reflect2$A) -> a -com.android.jack.shrob.test001.jack.Reflect2$A -> com.android.jack.shrob.test001.jack.b: -com.android.jack.shrob.test001.jack.Reflect2$B -> com.android.jack.shrob.test001.jack.c: + void m(com.android.jack.shrob.test001.jack.Reflect2$A) -> renamedM +com.android.jack.shrob.test001.jack.Reflect2$A -> com.android.jack.shrob.test001.jack.RenamedReflect2$A: +com.android.jack.shrob.test001.jack.Reflect2$B -> com.android.jack.shrob.test001.jack.RenamedReflect2$B: diff --git a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-014.txt b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-014.txt index 2967038..77808f5 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-014.txt +++ b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-014.txt @@ -1,6 +1,6 @@ com.android.jack.shrob.test001.jack.Reflect -> com.android.jack.shrob.test001.jack.Reflect: void <init>() -> <init> void keep6() -> keep6 -com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.a: - int fieldPublic -> a +com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.RenamedReflect2: + int fieldPublic -> renamedFieldPublic void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-015.txt b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-015.txt index 154a665..eb6fd7f 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-015.txt +++ b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-015.txt @@ -1,6 +1,6 @@ com.android.jack.shrob.test001.jack.Reflect -> com.android.jack.shrob.test001.jack.Reflect: void <init>() -> <init> void keep7() -> keep7 -com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.a: - long fieldLong -> b +com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.RenamedReflect2: + long fieldLong -> renamedFieldLong void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-016.txt b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-016.txt index 5ad9d9c..9bd0417 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-016.txt +++ b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-016.txt @@ -1,9 +1,9 @@ com.android.jack.shrob.test001.jack.Reflect -> com.android.jack.shrob.test001.jack.Reflect: void <init>() -> <init> void keep8() -> keep8 -com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.a: - com.android.jack.shrob.test001.jack.Reflect2$A a -> a - com.android.jack.shrob.test001.jack.Reflect2$B b -> b +com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.RenamedReflect2: + com.android.jack.shrob.test001.jack.Reflect2$A a -> renamedA + com.android.jack.shrob.test001.jack.Reflect2$B b -> renamedB void <init>() -> <init> -com.android.jack.shrob.test001.jack.Reflect2$A -> com.android.jack.shrob.test001.jack.b: -com.android.jack.shrob.test001.jack.Reflect2$B -> com.android.jack.shrob.test001.jack.c: +com.android.jack.shrob.test001.jack.Reflect2$A -> com.android.jack.shrob.test001.jack.RenamedReflect2$A: +com.android.jack.shrob.test001.jack.Reflect2$B -> com.android.jack.shrob.test001.jack.RenamedReflect2$B: diff --git a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-017.txt b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-017.txt index ccfdc41..fd3cb91 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-017.txt +++ b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-017.txt @@ -1,10 +1,10 @@ com.android.jack.shrob.test001.jack.K -> com.android.jack.shrob.test001.jack.K: - int i -> a - int h -> b - int i2 -> c - int j -> d - java.lang.Object o -> e - java.lang.String TAG2 -> f - void <clinit>() -> <clinit> + java.lang.String TAG2 -> renamedTAG2 + int h -> renamedH + int i -> renamedI + int i2 -> renamedI2 + int j -> renamedJ + java.lang.Object o -> renamedI void <init>() -> <init> void keep() -> keep + void <clinit>() -> <clinit> diff --git a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-019.txt b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-019.txt index 93a7c09..345010d 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-019.txt +++ b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-019.txt @@ -1,13 +1,13 @@ com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.Reflect2: - int fieldPublic -> fieldPublic - int fieldPrivate -> fieldPrivate + com.android.jack.shrob.test001.jack.Reflect2$A a -> a + com.android.jack.shrob.test001.jack.Reflect2$B b -> b + java.lang.Object c -> c long fieldLong -> fieldLong long fieldLong2 -> fieldLong2 long fieldLong3 -> fieldLong3 long fieldLong4 -> fieldLong4 - com.android.jack.shrob.test001.jack.Reflect2$A a -> a - com.android.jack.shrob.test001.jack.Reflect2$B b -> b - java.lang.Object c -> c + int fieldPrivate -> fieldPrivate + int fieldPublic -> fieldPublic void <init>() -> <init> void calledMethod() -> calledMethod void m(com.android.jack.shrob.test001.jack.Reflect2$A) -> m @@ -23,14 +23,14 @@ com.android.jack.shrob.test001.jack.L -> com.android.jack.shrob.test001.jack.L: void <init>() -> <init> void onReceive() -> onReceive com.android.jack.shrob.test001.jack.K -> com.android.jack.shrob.test001.jack.K: - int i -> i + java.lang.String TAG -> TAG + java.lang.String TAG2 -> TAG2 int h -> h + int i -> i int i2 -> i2 - int j -> j int i3 -> i3 + int j -> j java.lang.Object o -> o - java.lang.String TAG -> TAG - java.lang.String TAG2 -> TAG2 - void <clinit>() -> <clinit> void <init>() -> <init> void keep() -> keep + void <clinit>() -> <clinit> diff --git a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-020.txt b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-020.txt index a68d609..3123550 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-020.txt +++ b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-020.txt @@ -1,13 +1,13 @@ com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.Reflect2: - int fieldPublic -> fieldPublic - int fieldPrivate -> fieldPrivate + com.android.jack.shrob.test001.jack.Reflect2$A a -> a + com.android.jack.shrob.test001.jack.Reflect2$B b -> b + java.lang.Object c -> c long fieldLong -> fieldLong long fieldLong2 -> fieldLong2 long fieldLong3 -> fieldLong3 long fieldLong4 -> fieldLong4 - com.android.jack.shrob.test001.jack.Reflect2$A a -> a - com.android.jack.shrob.test001.jack.Reflect2$B b -> b - java.lang.Object c -> c + int fieldPrivate -> fieldPrivate + int fieldPublic -> fieldPublic void <init>() -> <init> com.android.jack.shrob.test001.jack.Reflect2$A -> com.android.jack.shrob.test001.jack.Reflect2$A: com.android.jack.shrob.test001.jack.Reflect2 this$0 -> this$0 @@ -17,13 +17,13 @@ com.android.jack.shrob.test001.jack.L -> com.android.jack.shrob.test001.jack.L: java.lang.String TAG -> TAG void <init>() -> <init> com.android.jack.shrob.test001.jack.K -> com.android.jack.shrob.test001.jack.K: - int i -> i + java.lang.String TAG -> TAG + java.lang.String TAG2 -> TAG2 int h -> h + int i -> i int i2 -> i2 - int j -> j int i3 -> i3 + int j -> j java.lang.Object o -> o - java.lang.String TAG -> TAG - java.lang.String TAG2 -> TAG2 - void <clinit>() -> <clinit> void <init>() -> <init> + void <clinit>() -> <clinit> diff --git a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-021.txt b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-021.txt index 350f38a..58b7103 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-021.txt +++ b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-021.txt @@ -1,65 +1,65 @@ -com.android.jack.shrob.test001.jack.E -> com.android.jack.shrob.test001.jack.e: +com.android.jack.shrob.test001.jack.E -> com.android.jack.shrob.test001.jack.RenamedE: void <init>() -> <init> - void keep() -> a -com.android.jack.shrob.test001.jack.I -> com.android.jack.shrob.test001.jack.i: - void m() -> a -com.android.jack.shrob.test001.jack.H -> com.android.jack.shrob.test001.jack.h: -com.android.jack.shrob.test001.jack.J -> com.android.jack.shrob.test001.jack.j: + void keep() -> renamedKeep +com.android.jack.shrob.test001.jack.I -> com.android.jack.shrob.test001.jack.RenamedI: + void m() -> renamedM +com.android.jack.shrob.test001.jack.H -> com.android.jack.shrob.test001.jack.RenamedH: +com.android.jack.shrob.test001.jack.J -> com.android.jack.shrob.test001.jack.RenamedJ: void <init>() -> <init> - int[][][] m5(int,boolean,long) -> a - int[][][] m3() -> a - int[][] m2() -> b - int[] m1() -> c - int m0() -> d - int[][][] m() -> e -com.android.jack.shrob.test001.jack.F -> com.android.jack.shrob.test001.jack.f: + int[][][] m() -> renamedM + int m0() -> renamedM0 + int[] m1() -> renamedM1 + int[][] m2() -> renamedM2 + int[][][] m3() -> renamedM3 + int[][][] m5(int,boolean,long) -> renamedM5 +com.android.jack.shrob.test001.jack.F -> com.android.jack.shrob.test001.jack.RenamedF: void <init>() -> <init> - void keep() -> a -com.android.jack.shrob.test001.jack.B -> com.android.jack.shrob.test001.jack.b: + void keep() -> renamedKeep +com.android.jack.shrob.test001.jack.B -> com.android.jack.shrob.test001.jack.RenamedB: void <init>() -> <init> -com.android.jack.shrob.test001.jack.D -> com.android.jack.shrob.test001.jack.d: +com.android.jack.shrob.test001.jack.D -> com.android.jack.shrob.test001.jack.RenamedD: void <init>() -> <init> - void keep() -> a - void main(java.lang.String[]) -> a - void main2(java.lang.String[]) -> b -com.android.jack.shrob.test001.jack.G -> com.android.jack.shrob.test001.jack.g: + void keep() -> renamedKeep + void main(java.lang.String[]) -> renamedMain + void main2(java.lang.String[]) -> renamedMain2 +com.android.jack.shrob.test001.jack.G -> com.android.jack.shrob.test001.jack.RenamedG: void <init>() -> <init> - void m() -> a - void main(java.lang.String[]) -> a -com.android.jack.shrob.test001.jack.Reflect -> com.android.jack.shrob.test001.jack.k: + void m() -> renamedM + void main(java.lang.String[]) -> renamedMain +com.android.jack.shrob.test001.jack.Reflect -> com.android.jack.shrob.test001.jack.RenamedReflect: void <init>() -> <init> - void keep() -> a - void keep2() -> b - void keep3() -> c - void keep4() -> d - void keep5() -> e - void keep6() -> f - void keep7() -> g - void keep8() -> h -com.android.jack.shrob.test001.jack.C -> com.android.jack.shrob.test001.jack.c: + void keep() -> renamedKeep + void keep2() -> renamedKeep2 + void keep3() -> renamedKeep3 + void keep4() -> renamedKeep4 + void keep5() -> renamedKeep5 + void keep6() -> renamedKeep6 + void keep7() -> renamedKeep7 + void keep8() -> renamedKeep8 +com.android.jack.shrob.test001.jack.C -> com.android.jack.shrob.test001.jack.RenamedC: void <init>() -> <init> - void f() -> a - void m() -> b -com.android.jack.shrob.test001.jack.A -> com.android.jack.shrob.test001.jack.a: - void <clinit>() -> <clinit> + void f() -> renamedF + void m() -> renamedM +com.android.jack.shrob.test001.jack.A -> com.android.jack.shrob.test001.jack.RenamedA: void <init>() -> <init> void <init>(int) -> <init> - void m() -> a - void privateFunc() -> b + void m() -> renamedM + void privateFunc() -> renamedPrivateFunc + void <clinit>() -> <clinit> com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.Reflect2: - int fieldPublic -> fieldPublic - int fieldPrivate -> fieldPrivate + com.android.jack.shrob.test001.jack.Reflect2$A a -> a + com.android.jack.shrob.test001.jack.Reflect2$B b -> b + java.lang.Object c -> c long fieldLong -> fieldLong long fieldLong2 -> fieldLong2 long fieldLong3 -> fieldLong3 long fieldLong4 -> fieldLong4 - com.android.jack.shrob.test001.jack.Reflect2$A a -> a - com.android.jack.shrob.test001.jack.Reflect2$B b -> b - java.lang.Object c -> c + int fieldPrivate -> fieldPrivate + int fieldPublic -> fieldPublic void <init>() -> <init> void calledMethod() -> a - void m(com.android.jack.shrob.test001.jack.Reflect2$A) -> a - void privateMethod(com.android.jack.shrob.test001.jack.Reflect2$B) -> a + void m(com.android.jack.shrob.test001.jack.Reflect2$A) -> b + void privateMethod(com.android.jack.shrob.test001.jack.Reflect2$B) -> c com.android.jack.shrob.test001.jack.Reflect2$A -> com.android.jack.shrob.test001.jack.Reflect2$A: com.android.jack.shrob.test001.jack.Reflect2 this$0 -> this$0 void <init>(com.android.jack.shrob.test001.jack.Reflect2) -> <init> @@ -71,14 +71,14 @@ com.android.jack.shrob.test001.jack.L -> com.android.jack.shrob.test001.jack.L: void <init>() -> <init> void onReceive() -> a com.android.jack.shrob.test001.jack.K -> com.android.jack.shrob.test001.jack.K: - int i -> i + java.lang.String TAG -> TAG + java.lang.String TAG2 -> TAG2 int h -> h + int i -> i int i2 -> i2 - int j -> j int i3 -> i3 + int j -> j java.lang.Object o -> o - java.lang.String TAG -> TAG - java.lang.String TAG2 -> TAG2 - void <clinit>() -> <clinit> void <init>() -> <init> - void keep() -> a + void keep() -> renamedKeep + void <clinit>() -> <clinit> diff --git a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-022.txt b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-022.txt index 5f9de20..0e236ab 100644 --- a/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-022.txt +++ b/jack-tests/tests/com/android/jack/shrob/test001/refsObfuscationWithMapping/expected-022.txt @@ -1,61 +1,61 @@ -com.android.jack.shrob.test001.jack.E -> com.android.jack.shrob.test001.jack.e: +com.android.jack.shrob.test001.jack.E -> com.android.jack.shrob.test001.jack.RenamedE: void <init>() -> <init> - void keep() -> a -com.android.jack.shrob.test001.jack.I -> com.android.jack.shrob.test001.jack.i: - void m() -> a -com.android.jack.shrob.test001.jack.H -> com.android.jack.shrob.test001.jack.h: -com.android.jack.shrob.test001.jack.J -> com.android.jack.shrob.test001.jack.j: + void keep() -> renamedKeep +com.android.jack.shrob.test001.jack.I -> com.android.jack.shrob.test001.jack.RenamedI: + void m() -> renamedM +com.android.jack.shrob.test001.jack.H -> com.android.jack.shrob.test001.jack.renamedH: +com.android.jack.shrob.test001.jack.J -> com.android.jack.shrob.test001.jack.renamedJ: void <init>() -> <init> - int[][][] m5(int,boolean,long) -> a - int[][][] m3() -> a - int[][] m2() -> b - int[] m1() -> c - int m0() -> d - int[][][] m() -> e -com.android.jack.shrob.test001.jack.F -> com.android.jack.shrob.test001.jack.f: + int[][][] m() -> renamedM + int m0() -> renamedM0 + int[] m1() -> renamedM1 + int[][] m2() -> renamedM2 + int[][][] m3() -> renamedM3 + int[][][] m5(int,boolean,long) -> renamedM5 +com.android.jack.shrob.test001.jack.F -> com.android.jack.shrob.test001.jack.RenamedF: void <init>() -> <init> - void keep() -> a -com.android.jack.shrob.test001.jack.B -> com.android.jack.shrob.test001.jack.b: + void keep() -> renamedKeep +com.android.jack.shrob.test001.jack.B -> com.android.jack.shrob.test001.jack.RenamedB: void <init>() -> <init> -com.android.jack.shrob.test001.jack.D -> com.android.jack.shrob.test001.jack.d: +com.android.jack.shrob.test001.jack.D -> com.android.jack.shrob.test001.jack.RenamedD: void <init>() -> <init> - void keep() -> a - void main(java.lang.String[]) -> a - void main2(java.lang.String[]) -> b -com.android.jack.shrob.test001.jack.G -> com.android.jack.shrob.test001.jack.g: + void keep() -> renamedKeep + void main(java.lang.String[]) -> renamedMain + void main2(java.lang.String[]) -> renamedMain2 +com.android.jack.shrob.test001.jack.G -> com.android.jack.shrob.test001.jack.RenamedG: void <init>() -> <init> - void m() -> a - void main(java.lang.String[]) -> a -com.android.jack.shrob.test001.jack.Reflect -> com.android.jack.shrob.test001.jack.k: + void m() -> renamedM + void main(java.lang.String[]) -> renamedMain +com.android.jack.shrob.test001.jack.Reflect -> com.android.jack.shrob.test001.jack.RenamedReflect: void <init>() -> <init> - void keep() -> a - void keep2() -> b - void keep3() -> c - void keep4() -> d - void keep5() -> e - void keep6() -> f - void keep7() -> g - void keep8() -> h -com.android.jack.shrob.test001.jack.C -> com.android.jack.shrob.test001.jack.c: + void keep() -> renamedKeep + void keep2() -> renamedKeep2 + void keep3() -> renamedKeep3 + void keep4() -> renamedKeep4 + void keep5() -> renamedKeep5 + void keep6() -> renamedKeep6 + void keep7() -> renamedKeep7 + void keep8() -> renamedKeep8 +com.android.jack.shrob.test001.jack.C -> com.android.jack.shrob.test001.jack.RenamedC: void <init>() -> <init> - void f() -> a - void m() -> b -com.android.jack.shrob.test001.jack.A -> com.android.jack.shrob.test001.jack.a: - void <clinit>() -> <clinit> + void f() -> renamedF + void m() -> renamedM +com.android.jack.shrob.test001.jack.A -> com.android.jack.shrob.test001.jack.RenamedA: void <init>() -> <init> void <init>(int) -> <init> - void m() -> a - void privateFunc() -> b + void m() -> renamedM + void privateFunc() -> renamedPrivateFunc + void <clinit>() -> <clinit> com.android.jack.shrob.test001.jack.Reflect2 -> com.android.jack.shrob.test001.jack.Reflect2: - int fieldPublic -> fieldPublic - int fieldPrivate -> fieldPrivate + com.android.jack.shrob.test001.jack.Reflect2$A a -> a + com.android.jack.shrob.test001.jack.Reflect2$B b -> b + java.lang.Object c -> c long fieldLong -> fieldLong long fieldLong2 -> fieldLong2 long fieldLong3 -> fieldLong3 long fieldLong4 -> fieldLong4 - com.android.jack.shrob.test001.jack.Reflect2$A a -> a - com.android.jack.shrob.test001.jack.Reflect2$B b -> b - java.lang.Object c -> c + int fieldPrivate -> fieldPrivate + int fieldPublic -> fieldPublic void <init>() -> <init> void calledMethod() -> calledMethod void m(com.android.jack.shrob.test001.jack.Reflect2$A) -> m @@ -71,14 +71,14 @@ com.android.jack.shrob.test001.jack.L -> com.android.jack.shrob.test001.jack.L: void <init>() -> <init> void onReceive() -> onReceive com.android.jack.shrob.test001.jack.K -> com.android.jack.shrob.test001.jack.K: - int i -> i + java.lang.String TAG -> TAG + java.lang.String TAG2 -> TAG2 int h -> h + int i -> i int i2 -> i2 - int j -> j int i3 -> i3 + int j -> j java.lang.Object o -> o - java.lang.String TAG -> TAG - java.lang.String TAG2 -> TAG2 - void <clinit>() -> <clinit> void <init>() -> <init> void keep() -> keep + void <clinit>() -> <clinit> diff --git a/jack-tests/tests/com/android/jack/shrob/test002/proguard.flags002.mapping b/jack-tests/tests/com/android/jack/shrob/test002/proguard.flags002.mapping deleted file mode 100644 index d184e76..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test002/proguard.flags002.mapping +++ /dev/null @@ -1 +0,0 @@ -com.android.jack.shrob.test002.jack.B -> com.android.jack.shrob.test002.jack.B: diff --git a/jack-tests/tests/com/android/jack/shrob/test002/proguard.flags003.mapping b/jack-tests/tests/com/android/jack/shrob/test002/proguard.flags003.mapping deleted file mode 100644 index d184e76..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test002/proguard.flags003.mapping +++ /dev/null @@ -1 +0,0 @@ -com.android.jack.shrob.test002.jack.B -> com.android.jack.shrob.test002.jack.B: diff --git a/jack-tests/tests/com/android/jack/shrob/test003/info.txt b/jack-tests/tests/com/android/jack/shrob/test003/info.txt new file mode 100644 index 0000000..ed6fc3d --- /dev/null +++ b/jack-tests/tests/com/android/jack/shrob/test003/info.txt @@ -0,0 +1,3 @@ +This test was written to show the different behavior between using library jars or injars. +The class in lib contains a Class.ForName with an existing class that should be kept when the +lib is used as a injar.
\ No newline at end of file diff --git a/jack-tests/tests/com/android/jack/shrob/test003/lib/Test.class b/jack-tests/tests/com/android/jack/shrob/test003/lib/Test.class Binary files differnew file mode 100644 index 0000000..bd9a8c9 --- /dev/null +++ b/jack-tests/tests/com/android/jack/shrob/test003/lib/Test.class diff --git a/jack-tests/tests/com/android/jack/shrob/test003/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test003/proguard.flags001.mapping deleted file mode 100644 index f6b7dd6..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test003/proguard.flags001.mapping +++ /dev/null @@ -1 +0,0 @@ -com.android.jack.shrob.test003.jack.B -> com.android.jack.shrob.test003.jack.B: diff --git a/jack-tests/tests/com/android/jack/shrob/test003/proguard.flags002 b/jack-tests/tests/com/android/jack/shrob/test003/proguard.flags002 new file mode 100644 index 0000000..320bdd0 --- /dev/null +++ b/jack-tests/tests/com/android/jack/shrob/test003/proguard.flags002 @@ -0,0 +1,3 @@ +-keep class com.android.jack.shrob.test003.lib.Test { + void keep(); +}
\ No newline at end of file diff --git a/jack-tests/tests/com/android/jack/shrob/test003/refsFlattenPackage/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test003/refsFlattenPackage/expected-001.txt deleted file mode 100644 index f231988..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test003/refsFlattenPackage/expected-001.txt +++ /dev/null @@ -1,2 +0,0 @@ -com.android.jack.shrob.test003.jack.B -> com.android.jack.shrob.test003.jack.B: - void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test003/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test003/refsObfuscationWithMapping/expected-001.txt deleted file mode 100644 index f231988..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test003/refsObfuscationWithMapping/expected-001.txt +++ /dev/null @@ -1,2 +0,0 @@ -com.android.jack.shrob.test003.jack.B -> com.android.jack.shrob.test003.jack.B: - void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test003/refsObfuscationWithoutMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test003/refsObfuscationWithoutMapping/expected-001.txt deleted file mode 100644 index f231988..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test003/refsObfuscationWithoutMapping/expected-001.txt +++ /dev/null @@ -1,2 +0,0 @@ -com.android.jack.shrob.test003.jack.B -> com.android.jack.shrob.test003.jack.B: - void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test003/refsRepackageClasses/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test003/refsRepackageClasses/expected-001.txt deleted file mode 100644 index f231988..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test003/refsRepackageClasses/expected-001.txt +++ /dev/null @@ -1,2 +0,0 @@ -com.android.jack.shrob.test003.jack.B -> com.android.jack.shrob.test003.jack.B: - void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test003/refsSeed/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test003/refsSeed/expected-001.txt deleted file mode 100644 index 90b2f3e..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test003/refsSeed/expected-001.txt +++ /dev/null @@ -1,3 +0,0 @@ -com.android.jack.shrob.test003.jack.B -com.android.jack.shrob.test003.lib.Test -com.android.jack.shrob.test003.lib.Test: void keep() diff --git a/jack-tests/tests/com/android/jack/shrob/test003/refsShrinking/expected-002.txt b/jack-tests/tests/com/android/jack/shrob/test003/refsShrinking/expected-002.txt new file mode 100644 index 0000000..d285e15 --- /dev/null +++ b/jack-tests/tests/com/android/jack/shrob/test003/refsShrinking/expected-002.txt @@ -0,0 +1,5 @@ +Lcom/android/jack/shrob/test003/jack/A;: +<init>()V +Lcom/android/jack/shrob/test003/lib/Test;: +<init>()V +keep()V diff --git a/jack-tests/tests/com/android/jack/shrob/test003/test.jar b/jack-tests/tests/com/android/jack/shrob/test003/test.jar Binary files differdeleted file mode 100644 index c05fa6b..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test003/test.jar +++ /dev/null diff --git a/jack-tests/tests/com/android/jack/shrob/test004/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test004/proguard.flags001.mapping index 95418dc..73c2c28 100644 --- a/jack-tests/tests/com/android/jack/shrob/test004/proguard.flags001.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test004/proguard.flags001.mapping @@ -1,2 +1,2 @@ com.android.jack.shrob.test004.jack.A -> com.android.jack.shrob.test004.jack.A: - void m() -> a + void m() -> renamedM diff --git a/jack-tests/tests/com/android/jack/shrob/test004/proguard.flags002.mapping b/jack-tests/tests/com/android/jack/shrob/test004/proguard.flags002.mapping index 8441b1f..94a7eaf 100644 --- a/jack-tests/tests/com/android/jack/shrob/test004/proguard.flags002.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test004/proguard.flags002.mapping @@ -1,3 +1,3 @@ com.android.jack.shrob.test004.jack.A -> com.android.jack.shrob.test004.jack.A: - void m() -> a - void m2() -> b + void m() -> renamedM + void m2() -> renamedM2 diff --git a/jack-tests/tests/com/android/jack/shrob/test004/proguard.flags003.mapping b/jack-tests/tests/com/android/jack/shrob/test004/proguard.flags003.mapping index 8441b1f..94a7eaf 100644 --- a/jack-tests/tests/com/android/jack/shrob/test004/proguard.flags003.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test004/proguard.flags003.mapping @@ -1,3 +1,3 @@ com.android.jack.shrob.test004.jack.A -> com.android.jack.shrob.test004.jack.A: - void m() -> a - void m2() -> b + void m() -> renamedM + void m2() -> renamedM2 diff --git a/jack-tests/tests/com/android/jack/shrob/test004/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test004/refsObfuscationWithMapping/expected-001.txt index 3695723..dc8b051 100644 --- a/jack-tests/tests/com/android/jack/shrob/test004/refsObfuscationWithMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test004/refsObfuscationWithMapping/expected-001.txt @@ -1,3 +1,3 @@ com.android.jack.shrob.test004.jack.A -> com.android.jack.shrob.test004.jack.A: void <init>() -> <init> - void m() -> a + void m() -> renamedM diff --git a/jack-tests/tests/com/android/jack/shrob/test004/refsObfuscationWithMapping/expected-002.txt b/jack-tests/tests/com/android/jack/shrob/test004/refsObfuscationWithMapping/expected-002.txt index 6dd9c9b..e19d8c6 100644 --- a/jack-tests/tests/com/android/jack/shrob/test004/refsObfuscationWithMapping/expected-002.txt +++ b/jack-tests/tests/com/android/jack/shrob/test004/refsObfuscationWithMapping/expected-002.txt @@ -1,5 +1,5 @@ com.android.jack.shrob.test004.jack.A -> com.android.jack.shrob.test004.jack.A: void <init>() -> <init> void <init>(int) -> <init> - void m() -> a - void m2() -> b + void m() -> renamedM + void m2() -> renamedM2 diff --git a/jack-tests/tests/com/android/jack/shrob/test004/refsObfuscationWithMapping/expected-003.txt b/jack-tests/tests/com/android/jack/shrob/test004/refsObfuscationWithMapping/expected-003.txt index 6dd9c9b..e19d8c6 100644 --- a/jack-tests/tests/com/android/jack/shrob/test004/refsObfuscationWithMapping/expected-003.txt +++ b/jack-tests/tests/com/android/jack/shrob/test004/refsObfuscationWithMapping/expected-003.txt @@ -1,5 +1,5 @@ com.android.jack.shrob.test004.jack.A -> com.android.jack.shrob.test004.jack.A: void <init>() -> <init> void <init>(int) -> <init> - void m() -> a - void m2() -> b + void m() -> renamedM + void m2() -> renamedM2 diff --git a/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags001.mapping index d1ece21..5cd97ea 100644 --- a/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags001.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags001.mapping @@ -1,4 +1,4 @@ -com.android.jack.shrob.test005.jack.A -> a.a.a.a.a.a.a: -com.android.jack.shrob.test005.jack.B -> a.a.a.a.a.a.b: -com.android.jack.shrob.test005.jack.Annot -> a.a.a.a.a.a.c: -com.android.jack.shrob.test005.jack.Annot2 -> a.a.a.a.a.a.d:
\ No newline at end of file +com.android.jack.shrob.test005.jack.A -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedA: +com.android.jack.shrob.test005.jack.B -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedB: +com.android.jack.shrob.test005.jack.Annot -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedAnnot: +com.android.jack.shrob.test005.jack.Annot2 -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedAnnot2:
\ No newline at end of file diff --git a/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags002.mapping b/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags002.mapping index ef90650..5cd97ea 100644 --- a/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags002.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags002.mapping @@ -1,4 +1,4 @@ -com.android.jack.shrob.test005.jack.A -> a.a.a.a.a.a.a: -com.android.jack.shrob.test005.jack.B -> a.a.a.a.a.a.b: -com.android.jack.shrob.test005.jack.Annot -> a.a.a.a.a.a.c: -com.android.jack.shrob.test005.jack.Annot2 -> a.a.a.a.a.a.d: +com.android.jack.shrob.test005.jack.A -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedA: +com.android.jack.shrob.test005.jack.B -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedB: +com.android.jack.shrob.test005.jack.Annot -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedAnnot: +com.android.jack.shrob.test005.jack.Annot2 -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedAnnot2:
\ No newline at end of file diff --git a/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags003.mapping b/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags003.mapping index d1ece21..5cd97ea 100644 --- a/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags003.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags003.mapping @@ -1,4 +1,4 @@ -com.android.jack.shrob.test005.jack.A -> a.a.a.a.a.a.a: -com.android.jack.shrob.test005.jack.B -> a.a.a.a.a.a.b: -com.android.jack.shrob.test005.jack.Annot -> a.a.a.a.a.a.c: -com.android.jack.shrob.test005.jack.Annot2 -> a.a.a.a.a.a.d:
\ No newline at end of file +com.android.jack.shrob.test005.jack.A -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedA: +com.android.jack.shrob.test005.jack.B -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedB: +com.android.jack.shrob.test005.jack.Annot -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedAnnot: +com.android.jack.shrob.test005.jack.Annot2 -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedAnnot2:
\ No newline at end of file diff --git a/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags004.mapping b/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags004.mapping deleted file mode 100644 index a01062b..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags004.mapping +++ /dev/null @@ -1 +0,0 @@ -com.android.jack.shrob.test005.jack.Annot -> com.android.jack.shrob.test005.jack.Annot: diff --git a/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags005.mapping b/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags005.mapping index 83f2fad..86e6525 100644 --- a/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags005.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags005.mapping @@ -1,13 +1,13 @@ -com.android.jack.shrob.test005.jack.A -> a.a.a.a.a.a.a: -com.android.jack.shrob.test005.jack.Annot -> a.a.a.a.a.a.b: - int intValue() -> a -com.android.jack.shrob.test005.jack.Annot2 -> a.a.a.a.a.a.c: -com.android.jack.shrob.test005.jack.B -> a.a.a.a.a.a.d: -com.android.jack.shrob.test005.jack.C -> a.a.a.a.a.a.e: -com.android.jack.shrob.test005.jack.E -> a.a.a.a.a.a.f: - com.android.jack.shrob.test005.jack.E A -> a - com.android.jack.shrob.test005.jack.E B -> b - com.android.jack.shrob.test005.jack.E C -> c - com.android.jack.shrob.test005.jack.E[] $VALUES -> d - com.android.jack.shrob.test005.jack.E valueOf(java.lang.String) -> a - com.android.jack.shrob.test005.jack.E[] values() -> b +com.android.jack.shrob.test005.jack.A -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedA: +com.android.jack.shrob.test005.jack.Annot -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedAnnot: + int intValue() -> renamedIntValue +com.android.jack.shrob.test005.jack.Annot2 -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedAnnot2: +com.android.jack.shrob.test005.jack.B -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedB: +com.android.jack.shrob.test005.jack.C -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedC: +com.android.jack.shrob.test005.jack.E -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedE: + com.android.jack.shrob.test005.jack.E A -> renamedA + com.android.jack.shrob.test005.jack.E B -> renamedB + com.android.jack.shrob.test005.jack.E C -> renamedC + com.android.jack.shrob.test005.jack.E[] $VALUES -> renamed$VALUES + com.android.jack.shrob.test005.jack.E valueOf(java.lang.String) -> renamedValueOf + com.android.jack.shrob.test005.jack.E[] values() -> renamedValues diff --git a/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags006.mapping b/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags006.mapping index 2fe0e72..0a24e15 100644 --- a/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags006.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags006.mapping @@ -1,10 +1,6 @@ -com.android.jack.shrob.test005.jack.A -> com.android.jack.shrob.test005.jack.A: -com.android.jack.shrob.test005.jack.Annot -> com.android.jack.shrob.test005.jack.Annot: -com.android.jack.shrob.test005.jack.Annot2 -> com.android.jack.shrob.test005.jack.Annot2: -com.android.jack.shrob.test005.jack.B -> com.android.jack.shrob.test005.jack.B: -com.android.jack.shrob.test005.jack.C -> com.android.jack.shrob.test005.jack.C: com.android.jack.shrob.test005.jack.E -> com.android.jack.shrob.test005.jack.E: - com.android.jack.shrob.test005.jack.E A -> a - com.android.jack.shrob.test005.jack.E B -> b - com.android.jack.shrob.test005.jack.E C -> c - com.android.jack.shrob.test005.jack.E[] $VALUES -> e + com.android.jack.shrob.test005.jack.E A -> renamedA + com.android.jack.shrob.test005.jack.E B -> renamedB + com.android.jack.shrob.test005.jack.E C -> renamedC + com.android.jack.shrob.test005.jack.E[] $VALUES -> renamed$VALUES + com.android.jack.shrob.test005.jack.E[] values() -> renamedValues diff --git a/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags007.mapping b/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags007.mapping deleted file mode 100644 index 8692631..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags007.mapping +++ /dev/null @@ -1,2 +0,0 @@ -com.android.jack.shrob.test005.jack.Annot -> com.android.jack.shrob.test005.jack.Annot: -com.android.jack.shrob.test005.jack.Annot2 -> com.android.jack.shrob.test005.jack.Annot2: diff --git a/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags008.mapping b/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags008.mapping index 4808055..0a24e15 100644 --- a/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags008.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test005/proguard.flags008.mapping @@ -1,5 +1,6 @@ com.android.jack.shrob.test005.jack.E -> com.android.jack.shrob.test005.jack.E: - com.android.jack.shrob.test005.jack.E A -> a - com.android.jack.shrob.test005.jack.E B -> b - com.android.jack.shrob.test005.jack.E C -> c - com.android.jack.shrob.test005.jack.E[] $VALUES -> e + com.android.jack.shrob.test005.jack.E A -> renamedA + com.android.jack.shrob.test005.jack.E B -> renamedB + com.android.jack.shrob.test005.jack.E C -> renamedC + com.android.jack.shrob.test005.jack.E[] $VALUES -> renamed$VALUES + com.android.jack.shrob.test005.jack.E[] values() -> renamedValues diff --git a/jack-tests/tests/com/android/jack/shrob/test005/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test005/refsObfuscationWithMapping/expected-001.txt index d31f1cf..a9c9020 100644 --- a/jack-tests/tests/com/android/jack/shrob/test005/refsObfuscationWithMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test005/refsObfuscationWithMapping/expected-001.txt @@ -1,6 +1,6 @@ -com.android.jack.shrob.test005.jack.Annot -> a.a.a.a.a.a.c: -com.android.jack.shrob.test005.jack.A -> a.a.a.a.a.a.a: +com.android.jack.shrob.test005.jack.Annot -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedAnnot: +com.android.jack.shrob.test005.jack.A -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedA: void <init>() -> <init> -com.android.jack.shrob.test005.jack.B -> a.a.a.a.a.a.b: +com.android.jack.shrob.test005.jack.B -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedB: void <init>() -> <init> -com.android.jack.shrob.test005.jack.Annot2 -> a.a.a.a.a.a.d: +com.android.jack.shrob.test005.jack.Annot2 -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedAnnot2: diff --git a/jack-tests/tests/com/android/jack/shrob/test005/refsObfuscationWithMapping/expected-002.txt b/jack-tests/tests/com/android/jack/shrob/test005/refsObfuscationWithMapping/expected-002.txt index d31f1cf..a9c9020 100644 --- a/jack-tests/tests/com/android/jack/shrob/test005/refsObfuscationWithMapping/expected-002.txt +++ b/jack-tests/tests/com/android/jack/shrob/test005/refsObfuscationWithMapping/expected-002.txt @@ -1,6 +1,6 @@ -com.android.jack.shrob.test005.jack.Annot -> a.a.a.a.a.a.c: -com.android.jack.shrob.test005.jack.A -> a.a.a.a.a.a.a: +com.android.jack.shrob.test005.jack.Annot -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedAnnot: +com.android.jack.shrob.test005.jack.A -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedA: void <init>() -> <init> -com.android.jack.shrob.test005.jack.B -> a.a.a.a.a.a.b: +com.android.jack.shrob.test005.jack.B -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedB: void <init>() -> <init> -com.android.jack.shrob.test005.jack.Annot2 -> a.a.a.a.a.a.d: +com.android.jack.shrob.test005.jack.Annot2 -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedAnnot2: diff --git a/jack-tests/tests/com/android/jack/shrob/test005/refsObfuscationWithMapping/expected-003.txt b/jack-tests/tests/com/android/jack/shrob/test005/refsObfuscationWithMapping/expected-003.txt index d31f1cf..a9c9020 100644 --- a/jack-tests/tests/com/android/jack/shrob/test005/refsObfuscationWithMapping/expected-003.txt +++ b/jack-tests/tests/com/android/jack/shrob/test005/refsObfuscationWithMapping/expected-003.txt @@ -1,6 +1,6 @@ -com.android.jack.shrob.test005.jack.Annot -> a.a.a.a.a.a.c: -com.android.jack.shrob.test005.jack.A -> a.a.a.a.a.a.a: +com.android.jack.shrob.test005.jack.Annot -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedAnnot: +com.android.jack.shrob.test005.jack.A -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedA: void <init>() -> <init> -com.android.jack.shrob.test005.jack.B -> a.a.a.a.a.a.b: +com.android.jack.shrob.test005.jack.B -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedB: void <init>() -> <init> -com.android.jack.shrob.test005.jack.Annot2 -> a.a.a.a.a.a.d: +com.android.jack.shrob.test005.jack.Annot2 -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedAnnot2: diff --git a/jack-tests/tests/com/android/jack/shrob/test005/refsObfuscationWithMapping/expected-005.txt b/jack-tests/tests/com/android/jack/shrob/test005/refsObfuscationWithMapping/expected-005.txt index 38f0380..fded0e5 100644 --- a/jack-tests/tests/com/android/jack/shrob/test005/refsObfuscationWithMapping/expected-005.txt +++ b/jack-tests/tests/com/android/jack/shrob/test005/refsObfuscationWithMapping/expected-005.txt @@ -1,18 +1,18 @@ -com.android.jack.shrob.test005.jack.Annot -> a.a.a.a.a.a.b: - int intValue() -> a -com.android.jack.shrob.test005.jack.E -> a.a.a.a.a.a.f: - com.android.jack.shrob.test005.jack.E A -> a - com.android.jack.shrob.test005.jack.E B -> b - com.android.jack.shrob.test005.jack.E C -> c - com.android.jack.shrob.test005.jack.E[] $VALUES -> d - void <clinit>() -> <clinit> - com.android.jack.shrob.test005.jack.E valueOf(java.lang.String) -> a - com.android.jack.shrob.test005.jack.E[] values() -> b +com.android.jack.shrob.test005.jack.Annot -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedAnnot: + int intValue() -> renamedIntValue +com.android.jack.shrob.test005.jack.E -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedE: + com.android.jack.shrob.test005.jack.E A -> renamedA + com.android.jack.shrob.test005.jack.E B -> renamedB + com.android.jack.shrob.test005.jack.E C -> renamedC + com.android.jack.shrob.test005.jack.E[] $VALUES -> renamed$VALUES void <init>(java.lang.String,int) -> <init> -com.android.jack.shrob.test005.jack.A -> a.a.a.a.a.a.a: + com.android.jack.shrob.test005.jack.E valueOf(java.lang.String) -> renamedValueOf + com.android.jack.shrob.test005.jack.E[] values() -> renamedValues + void <clinit>() -> <clinit> +com.android.jack.shrob.test005.jack.A -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedA: void <init>() -> <init> -com.android.jack.shrob.test005.jack.B -> a.a.a.a.a.a.d: +com.android.jack.shrob.test005.jack.B -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedB: void <init>() -> <init> -com.android.jack.shrob.test005.jack.C -> a.a.a.a.a.a.e: +com.android.jack.shrob.test005.jack.C -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedC: void <init>() -> <init> -com.android.jack.shrob.test005.jack.Annot2 -> a.a.a.a.a.a.c: +com.android.jack.shrob.test005.jack.Annot2 -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest005.renamedJack.RenamedAnnot2: diff --git a/jack-tests/tests/com/android/jack/shrob/test005/refsObfuscationWithMapping/expected-006.txt b/jack-tests/tests/com/android/jack/shrob/test005/refsObfuscationWithMapping/expected-006.txt index 35a7a05..b2a5fa4 100644 --- a/jack-tests/tests/com/android/jack/shrob/test005/refsObfuscationWithMapping/expected-006.txt +++ b/jack-tests/tests/com/android/jack/shrob/test005/refsObfuscationWithMapping/expected-006.txt @@ -1,12 +1,12 @@ com.android.jack.shrob.test005.jack.Annot -> com.android.jack.shrob.test005.jack.Annot: com.android.jack.shrob.test005.jack.E -> com.android.jack.shrob.test005.jack.E: - com.android.jack.shrob.test005.jack.E A -> a - com.android.jack.shrob.test005.jack.E B -> b - com.android.jack.shrob.test005.jack.E C -> c - com.android.jack.shrob.test005.jack.E[] $VALUES -> e - com.android.jack.shrob.test005.jack.E[] values() -> a - void <clinit>() -> <clinit> + com.android.jack.shrob.test005.jack.E A -> renamedA + com.android.jack.shrob.test005.jack.E B -> renamedB + com.android.jack.shrob.test005.jack.E C -> renamedC + com.android.jack.shrob.test005.jack.E[] $VALUES -> renamed$VALUES void <init>(java.lang.String,int) -> <init> + com.android.jack.shrob.test005.jack.E[] values() -> renamedValues + void <clinit>() -> <clinit> com.android.jack.shrob.test005.jack.A -> com.android.jack.shrob.test005.jack.A: void <init>() -> <init> com.android.jack.shrob.test005.jack.B -> com.android.jack.shrob.test005.jack.B: diff --git a/jack-tests/tests/com/android/jack/shrob/test005/refsObfuscationWithMapping/expected-008.txt b/jack-tests/tests/com/android/jack/shrob/test005/refsObfuscationWithMapping/expected-008.txt index 723de19..99f600a 100644 --- a/jack-tests/tests/com/android/jack/shrob/test005/refsObfuscationWithMapping/expected-008.txt +++ b/jack-tests/tests/com/android/jack/shrob/test005/refsObfuscationWithMapping/expected-008.txt @@ -1,8 +1,8 @@ com.android.jack.shrob.test005.jack.E -> com.android.jack.shrob.test005.jack.E: - com.android.jack.shrob.test005.jack.E A -> a - com.android.jack.shrob.test005.jack.E B -> b - com.android.jack.shrob.test005.jack.E C -> c - com.android.jack.shrob.test005.jack.E[] $VALUES -> e - com.android.jack.shrob.test005.jack.E[] values() -> a - void <clinit>() -> <clinit> + com.android.jack.shrob.test005.jack.E A -> renamedA + com.android.jack.shrob.test005.jack.E B -> renamedB + com.android.jack.shrob.test005.jack.E C -> renamedC + com.android.jack.shrob.test005.jack.E[] $VALUES -> renamed$VALUES void <init>(java.lang.String,int) -> <init> + com.android.jack.shrob.test005.jack.E[] values() -> renamedValues + void <clinit>() -> <clinit> diff --git a/jack-tests/tests/com/android/jack/shrob/test006/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test006/proguard.flags001.mapping deleted file mode 100644 index 2be876c..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test006/proguard.flags001.mapping +++ /dev/null @@ -1,4 +0,0 @@ -com.android.jack.shrob.test006.jack.A -> com.android.jack.shrob.test006.jack.A: - void m1() -> m1 - void m4() -> m4 - void m5(java.lang.String[]) -> m5 diff --git a/jack-tests/tests/com/android/jack/shrob/test006/proguard.flags002.mapping b/jack-tests/tests/com/android/jack/shrob/test006/proguard.flags002.mapping deleted file mode 100644 index 542bff4..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test006/proguard.flags002.mapping +++ /dev/null @@ -1,4 +0,0 @@ -com.android.jack.shrob.test006.jack.A -> com.android.jack.shrob.test006.jack.A: - void m() -> m - void m2() -> m2 - int m8() -> m8 diff --git a/jack-tests/tests/com/android/jack/shrob/test006/proguard.flags003.mapping b/jack-tests/tests/com/android/jack/shrob/test006/proguard.flags003.mapping deleted file mode 100644 index 4aff1a6..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test006/proguard.flags003.mapping +++ /dev/null @@ -1,2 +0,0 @@ -com.android.jack.shrob.test006.jack.A -> com.android.jack.shrob.test006.jack.A: - void m5(java.lang.String[]) -> m5 diff --git a/jack-tests/tests/com/android/jack/shrob/test006/proguard.flags004.mapping b/jack-tests/tests/com/android/jack/shrob/test006/proguard.flags004.mapping deleted file mode 100644 index d7ecf53..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test006/proguard.flags004.mapping +++ /dev/null @@ -1,3 +0,0 @@ -com.android.jack.shrob.test006.jack.A -> com.android.jack.shrob.test006.jack.A: - void m6() -> m6 - void m7() -> m7 diff --git a/jack-tests/tests/com/android/jack/shrob/test006/proguard.flags005.mapping b/jack-tests/tests/com/android/jack/shrob/test006/proguard.flags005.mapping deleted file mode 100644 index e215817..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test006/proguard.flags005.mapping +++ /dev/null @@ -1,5 +0,0 @@ -com.android.jack.shrob.test006.jack.A -> com.android.jack.shrob.test006.jack.A: - void m() -> m - void m2() -> m2 - void m6() -> m6 - int m8() -> m8 diff --git a/jack-tests/tests/com/android/jack/shrob/test006/proguard.flags006.mapping b/jack-tests/tests/com/android/jack/shrob/test006/proguard.flags006.mapping deleted file mode 100644 index 96b4c9d..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test006/proguard.flags006.mapping +++ /dev/null @@ -1,5 +0,0 @@ -com.android.jack.shrob.test006.jack.A -> com.android.jack.shrob.test006.jack.A: - void m1() -> m1 - void m3() -> m3 - void m4() -> m4 - void m5(java.lang.String[]) -> m5 diff --git a/jack-tests/tests/com/android/jack/shrob/test007/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test007/proguard.flags001.mapping deleted file mode 100644 index a420b6c..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test007/proguard.flags001.mapping +++ /dev/null @@ -1,2 +0,0 @@ -com.android.jack.shrob.test007.jack.A -> com.android.jack.shrob.test007.jack.A: - java.lang.Object getObject() -> getObject diff --git a/jack-tests/tests/com/android/jack/shrob/test007/proguard.flags002.mapping b/jack-tests/tests/com/android/jack/shrob/test007/proguard.flags002.mapping deleted file mode 100644 index d0a31d4..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test007/proguard.flags002.mapping +++ /dev/null @@ -1,4 +0,0 @@ -com.android.jack.shrob.test007.jack.A -> com.android.jack.shrob.test007.jack.A: - java.lang.Object getObject() -> getObject - float getFloat() -> getFloat - java.lang.Object[] getObjects() -> getObjects diff --git a/jack-tests/tests/com/android/jack/shrob/test007/proguard.flags003.mapping b/jack-tests/tests/com/android/jack/shrob/test007/proguard.flags003.mapping deleted file mode 100644 index b01ae59..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test007/proguard.flags003.mapping +++ /dev/null @@ -1,2 +0,0 @@ -com.android.jack.shrob.test007.jack.A -> com.android.jack.shrob.test007.jack.A: - float getFloat() -> getFloat diff --git a/jack-tests/tests/com/android/jack/shrob/test007/refsObfuscationWithMapping/expected-002.txt b/jack-tests/tests/com/android/jack/shrob/test007/refsObfuscationWithMapping/expected-002.txt index 03e309f..12bf267 100644 --- a/jack-tests/tests/com/android/jack/shrob/test007/refsObfuscationWithMapping/expected-002.txt +++ b/jack-tests/tests/com/android/jack/shrob/test007/refsObfuscationWithMapping/expected-002.txt @@ -1,5 +1,5 @@ com.android.jack.shrob.test007.jack.A -> com.android.jack.shrob.test007.jack.A: void <init>() -> <init> - java.lang.Object getObject() -> getObject float getFloat() -> getFloat + java.lang.Object getObject() -> getObject java.lang.Object[] getObjects() -> getObjects diff --git a/jack-tests/tests/com/android/jack/shrob/test008/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test008/proguard.flags001.mapping index 2b32885..b97a198 100644 --- a/jack-tests/tests/com/android/jack/shrob/test008/proguard.flags001.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test008/proguard.flags001.mapping @@ -1,4 +1,3 @@ com.android.jack.shrob.test008.jack.A -> com.android.jack.shrob.test008.jack.A: - void m() -> a - void keep() -> keep -com.android.jack.shrob.test008.jack.MyException -> com.android.jack.shrob.test008.jack.a: + void m() -> renamedM +com.android.jack.shrob.test008.jack.MyException -> com.android.jack.shrob.test008.jack.RenamedMyException: diff --git a/jack-tests/tests/com/android/jack/shrob/test008/proguard.flags002.mapping b/jack-tests/tests/com/android/jack/shrob/test008/proguard.flags002.mapping index a10fae7..b97a198 100644 --- a/jack-tests/tests/com/android/jack/shrob/test008/proguard.flags002.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test008/proguard.flags002.mapping @@ -1,4 +1,3 @@ com.android.jack.shrob.test008.jack.A -> com.android.jack.shrob.test008.jack.A: - void m() -> a - void keep2() -> keep2 -com.android.jack.shrob.test008.jack.MyException -> com.android.jack.shrob.test008.jack.a: + void m() -> renamedM +com.android.jack.shrob.test008.jack.MyException -> com.android.jack.shrob.test008.jack.RenamedMyException: diff --git a/jack-tests/tests/com/android/jack/shrob/test008/proguard.flags003.mapping b/jack-tests/tests/com/android/jack/shrob/test008/proguard.flags003.mapping index b8617a4..b97a198 100644 --- a/jack-tests/tests/com/android/jack/shrob/test008/proguard.flags003.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test008/proguard.flags003.mapping @@ -1,4 +1,3 @@ com.android.jack.shrob.test008.jack.A -> com.android.jack.shrob.test008.jack.A: - void m() -> a - void keep3() -> keep3 -com.android.jack.shrob.test008.jack.MyException -> com.android.jack.shrob.test008.jack.a: + void m() -> renamedM +com.android.jack.shrob.test008.jack.MyException -> com.android.jack.shrob.test008.jack.RenamedMyException: diff --git a/jack-tests/tests/com/android/jack/shrob/test008/proguard.flags004.mapping b/jack-tests/tests/com/android/jack/shrob/test008/proguard.flags004.mapping index c2a969a..29a3a97 100644 --- a/jack-tests/tests/com/android/jack/shrob/test008/proguard.flags004.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test008/proguard.flags004.mapping @@ -1,3 +1 @@ -com.android.jack.shrob.test008.jack.A -> com.android.jack.shrob.test008.jack.A: - void keep4() -> keep4 -com.android.jack.shrob.test008.jack.MyException -> com.android.jack.shrob.test008.jack.a: +com.android.jack.shrob.test008.jack.MyException -> com.android.jack.shrob.test008.jack.RenamedMyException: diff --git a/jack-tests/tests/com/android/jack/shrob/test008/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test008/refsObfuscationWithMapping/expected-001.txt index d4eae97..3327d44 100644 --- a/jack-tests/tests/com/android/jack/shrob/test008/refsObfuscationWithMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test008/refsObfuscationWithMapping/expected-001.txt @@ -1,6 +1,6 @@ com.android.jack.shrob.test008.jack.A -> com.android.jack.shrob.test008.jack.A: void <init>() -> <init> - void m() -> a void keep() -> keep -com.android.jack.shrob.test008.jack.MyException -> com.android.jack.shrob.test008.jack.a: + void m() -> renamedM +com.android.jack.shrob.test008.jack.MyException -> com.android.jack.shrob.test008.jack.RenamedMyException: void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test008/refsObfuscationWithMapping/expected-002.txt b/jack-tests/tests/com/android/jack/shrob/test008/refsObfuscationWithMapping/expected-002.txt index 6fc69ba..422da79 100644 --- a/jack-tests/tests/com/android/jack/shrob/test008/refsObfuscationWithMapping/expected-002.txt +++ b/jack-tests/tests/com/android/jack/shrob/test008/refsObfuscationWithMapping/expected-002.txt @@ -1,6 +1,6 @@ com.android.jack.shrob.test008.jack.A -> com.android.jack.shrob.test008.jack.A: void <init>() -> <init> - void m() -> a void keep2() -> keep2 -com.android.jack.shrob.test008.jack.MyException -> com.android.jack.shrob.test008.jack.a: + void m() -> renamedM +com.android.jack.shrob.test008.jack.MyException -> com.android.jack.shrob.test008.jack.RenamedMyException: void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test008/refsObfuscationWithMapping/expected-003.txt b/jack-tests/tests/com/android/jack/shrob/test008/refsObfuscationWithMapping/expected-003.txt index d9bde3b..bf98e39 100644 --- a/jack-tests/tests/com/android/jack/shrob/test008/refsObfuscationWithMapping/expected-003.txt +++ b/jack-tests/tests/com/android/jack/shrob/test008/refsObfuscationWithMapping/expected-003.txt @@ -1,6 +1,6 @@ com.android.jack.shrob.test008.jack.A -> com.android.jack.shrob.test008.jack.A: void <init>() -> <init> - void m() -> a void keep3() -> keep3 -com.android.jack.shrob.test008.jack.MyException -> com.android.jack.shrob.test008.jack.a: + void m() -> renamedM +com.android.jack.shrob.test008.jack.MyException -> com.android.jack.shrob.test008.jack.RenamedMyException: void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test008/refsObfuscationWithMapping/expected-004.txt b/jack-tests/tests/com/android/jack/shrob/test008/refsObfuscationWithMapping/expected-004.txt index 8f3f534..376accb 100644 --- a/jack-tests/tests/com/android/jack/shrob/test008/refsObfuscationWithMapping/expected-004.txt +++ b/jack-tests/tests/com/android/jack/shrob/test008/refsObfuscationWithMapping/expected-004.txt @@ -1,5 +1,5 @@ com.android.jack.shrob.test008.jack.A -> com.android.jack.shrob.test008.jack.A: void <init>() -> <init> void keep4() -> keep4 -com.android.jack.shrob.test008.jack.MyException -> com.android.jack.shrob.test008.jack.a: +com.android.jack.shrob.test008.jack.MyException -> com.android.jack.shrob.test008.jack.RenamedMyException: void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test009/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test009/proguard.flags001.mapping deleted file mode 100644 index 900362c..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test009/proguard.flags001.mapping +++ /dev/null @@ -1,2 +0,0 @@ -com.android.jack.shrob.test009.jack.A -> com.android.jack.shrob.test009.jack.A: - void m(int,boolean,float,long) -> m diff --git a/jack-tests/tests/com/android/jack/shrob/test009/proguard.flags002.mapping b/jack-tests/tests/com/android/jack/shrob/test009/proguard.flags002.mapping deleted file mode 100644 index 900362c..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test009/proguard.flags002.mapping +++ /dev/null @@ -1,2 +0,0 @@ -com.android.jack.shrob.test009.jack.A -> com.android.jack.shrob.test009.jack.A: - void m(int,boolean,float,long) -> m diff --git a/jack-tests/tests/com/android/jack/shrob/test009/proguard.flags003.mapping b/jack-tests/tests/com/android/jack/shrob/test009/proguard.flags003.mapping deleted file mode 100644 index 900362c..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test009/proguard.flags003.mapping +++ /dev/null @@ -1,2 +0,0 @@ -com.android.jack.shrob.test009.jack.A -> com.android.jack.shrob.test009.jack.A: - void m(int,boolean,float,long) -> m diff --git a/jack-tests/tests/com/android/jack/shrob/test010/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test010/proguard.flags001.mapping index fb83ecd..40d45af 100644 --- a/jack-tests/tests/com/android/jack/shrob/test010/proguard.flags001.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test010/proguard.flags001.mapping @@ -1,2 +1 @@ -com.android.jack.shrob.test010.jack.B -> com.android.jack.shrob.test010.jack.B: - void keep() -> keep +com.android.jack.shrob.test010.jack.A -> com.android.jack.shrob.test010.jack.RenamedA: diff --git a/jack-tests/tests/com/android/jack/shrob/test010/proguard.flags002.mapping b/jack-tests/tests/com/android/jack/shrob/test010/proguard.flags002.mapping deleted file mode 100644 index c66dc7a..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test010/proguard.flags002.mapping +++ /dev/null @@ -1,3 +0,0 @@ -com.android.jack.shrob.test010.jack.A -> com.android.jack.shrob.test010.jack.A: - java.lang.Object get() -> get - void set(java.lang.Object) -> set diff --git a/jack-tests/tests/com/android/jack/shrob/test010/proguard.flags003.mapping b/jack-tests/tests/com/android/jack/shrob/test010/proguard.flags003.mapping index 6829e58..e32b485 100644 --- a/jack-tests/tests/com/android/jack/shrob/test010/proguard.flags003.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test010/proguard.flags003.mapping @@ -1,4 +1 @@ -com.android.jack.shrob.test010.jack.A -> com.android.jack.shrob.test010.jack.A: - java.lang.Object get() -> get - void set(com.android.jack.shrob.test010.jack.C) -> set -com.android.jack.shrob.test010.jack.C -> com.android.jack.shrob.test010.jack.a: +com.android.jack.shrob.test010.jack.C -> com.android.jack.shrob.test010.jack.RenamedC: diff --git a/jack-tests/tests/com/android/jack/shrob/test010/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test010/refsObfuscationWithMapping/expected-001.txt index 370e43e..698145e 100644 --- a/jack-tests/tests/com/android/jack/shrob/test010/refsObfuscationWithMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test010/refsObfuscationWithMapping/expected-001.txt @@ -1,5 +1,5 @@ com.android.jack.shrob.test010.jack.B -> com.android.jack.shrob.test010.jack.B: void <init>() -> <init> void keep() -> keep -com.android.jack.shrob.test010.jack.A -> com.android.jack.shrob.test010.jack.a: +com.android.jack.shrob.test010.jack.A -> com.android.jack.shrob.test010.jack.RenamedA: void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test010/refsObfuscationWithMapping/expected-003.txt b/jack-tests/tests/com/android/jack/shrob/test010/refsObfuscationWithMapping/expected-003.txt index 415214d..92c67ea 100644 --- a/jack-tests/tests/com/android/jack/shrob/test010/refsObfuscationWithMapping/expected-003.txt +++ b/jack-tests/tests/com/android/jack/shrob/test010/refsObfuscationWithMapping/expected-003.txt @@ -1,4 +1,4 @@ -com.android.jack.shrob.test010.jack.C -> com.android.jack.shrob.test010.jack.a: +com.android.jack.shrob.test010.jack.C -> com.android.jack.shrob.test010.jack.RenamedC: void <init>() -> <init> com.android.jack.shrob.test010.jack.A -> com.android.jack.shrob.test010.jack.A: void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test011/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test011/proguard.flags001.mapping index 20cd8cd..cfd70e5 100644 --- a/jack-tests/tests/com/android/jack/shrob/test011/proguard.flags001.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test011/proguard.flags001.mapping @@ -1,3 +1,2 @@ -com.android.jack.shrob.test011.jack.A -> com.android.jack.shrob.test011.jack.A: - java.lang.Object keep1() -> keep1 -com.android.jack.shrob.test011.jack.B -> com.android.jack.shrob.test011.jack.a: +com.android.jack.shrob.test011.jack.B -> com.android.jack.shrob.test011.jack.RenamedB: +com.android.jack.shrob.test011.jack.C -> com.android.jack.shrob.test011.jack.RenamedC: diff --git a/jack-tests/tests/com/android/jack/shrob/test011/proguard.flags002.mapping b/jack-tests/tests/com/android/jack/shrob/test011/proguard.flags002.mapping index b4d6638..b14d9cd 100644 --- a/jack-tests/tests/com/android/jack/shrob/test011/proguard.flags002.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test011/proguard.flags002.mapping @@ -1,4 +1,2 @@ -com.android.jack.shrob.test011.jack.A -> com.android.jack.shrob.test011.jack.A: - int keep2() -> keep2 -com.android.jack.shrob.test011.jack.B -> com.android.jack.shrob.test011.jack.a: - int value() -> a +com.android.jack.shrob.test011.jack.B -> com.android.jack.shrob.test011.jack.RenamedB: + int value() -> renamedValue diff --git a/jack-tests/tests/com/android/jack/shrob/test011/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test011/refsObfuscationWithMapping/expected-001.txt index 4b930bf..681f4ba 100644 --- a/jack-tests/tests/com/android/jack/shrob/test011/refsObfuscationWithMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test011/refsObfuscationWithMapping/expected-001.txt @@ -1,6 +1,6 @@ -com.android.jack.shrob.test011.jack.B -> com.android.jack.shrob.test011.jack.a: +com.android.jack.shrob.test011.jack.B -> com.android.jack.shrob.test011.jack.RenamedB: void <init>() -> <init> -com.android.jack.shrob.test011.jack.C -> com.android.jack.shrob.test011.jack.b: +com.android.jack.shrob.test011.jack.C -> com.android.jack.shrob.test011.jack.RenamedC: void <init>() -> <init> com.android.jack.shrob.test011.jack.A -> com.android.jack.shrob.test011.jack.A: void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test011/refsObfuscationWithMapping/expected-002.txt b/jack-tests/tests/com/android/jack/shrob/test011/refsObfuscationWithMapping/expected-002.txt index a1dd7bc..7365948 100644 --- a/jack-tests/tests/com/android/jack/shrob/test011/refsObfuscationWithMapping/expected-002.txt +++ b/jack-tests/tests/com/android/jack/shrob/test011/refsObfuscationWithMapping/expected-002.txt @@ -1,6 +1,6 @@ -com.android.jack.shrob.test011.jack.B -> com.android.jack.shrob.test011.jack.a: +com.android.jack.shrob.test011.jack.B -> com.android.jack.shrob.test011.jack.RenamedB: void <init>() -> <init> - int value() -> a + int value() -> renamedValue com.android.jack.shrob.test011.jack.A -> com.android.jack.shrob.test011.jack.A: void <init>() -> <init> int keep2() -> keep2 diff --git a/jack-tests/tests/com/android/jack/shrob/test012/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test012/proguard.flags001.mapping deleted file mode 100644 index 904d812..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test012/proguard.flags001.mapping +++ /dev/null @@ -1,2 +0,0 @@ -com.android.jack.shrob.test012.jack.A -> com.android.jack.shrob.test012.jack.A: - void m(com.android.jack.shrob.test012.jack.A) -> m diff --git a/jack-tests/tests/com/android/jack/shrob/test013/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test013/proguard.flags001.mapping deleted file mode 100644 index 053e592..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test013/proguard.flags001.mapping +++ /dev/null @@ -1,2 +0,0 @@ -com.android.jack.shrob.test013.jack.A -> com.android.jack.shrob.test013.jack.A: - 26:26:void m(com.android.jack.shrob.test013.jack.A) -> m diff --git a/jack-tests/tests/com/android/jack/shrob/test014/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test014/proguard.flags001.mapping index 9cede76..9bd0a54 100644 --- a/jack-tests/tests/com/android/jack/shrob/test014/proguard.flags001.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test014/proguard.flags001.mapping @@ -1,18 +1,16 @@ com.android.jack.shrob.test014.jack.A -> com.android.jack.shrob.test014.jack.A: - int a -> a - int m -> b - boolean b -> c - void m() -> b - void f() -> c - void m(int) -> a - void g() -> d - void keep() -> keep + int a -> renamedA + int m -> renamedM + boolean b -> renamedB + void m() -> renamedM + void f() -> renamedF + void m(int) -> renamedM + void g() -> renamedG com.android.jack.shrob.test014.jack.B -> com.android.jack.shrob.test014.jack.B: - char c -> d - boolean m -> e - void a() -> a - void r() -> e - void m() -> b - void l() -> f - void m(int) -> a - void keep() -> keep + char c -> renamedC + boolean m -> renamedM + void a() -> renamedA + void r() -> renamedR + void m() -> renamedM + void l() -> renamedL + void m(int) -> renamedM diff --git a/jack-tests/tests/com/android/jack/shrob/test014/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test014/refsObfuscationWithMapping/expected-001.txt index 1572c2d..0790e02 100644 --- a/jack-tests/tests/com/android/jack/shrob/test014/refsObfuscationWithMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test014/refsObfuscationWithMapping/expected-001.txt @@ -1,20 +1,20 @@ com.android.jack.shrob.test014.jack.B -> com.android.jack.shrob.test014.jack.B: - char c -> d - boolean m -> e + char c -> renamedC + boolean m -> renamedM void <init>() -> <init> - void a() -> a - void r() -> e - void m() -> b - void l() -> f - void m(int) -> a + void a() -> renamedA void keep() -> keep + void l() -> renamedL + void m() -> renamedM + void m(int) -> renamedM + void r() -> renamedR com.android.jack.shrob.test014.jack.A -> com.android.jack.shrob.test014.jack.A: - int a -> a - int m -> b - boolean b -> c + int a -> renamedA + boolean b -> renamedB + int m -> renamedM void <init>() -> <init> - void m() -> b - void f() -> c - void m(int) -> a - void g() -> d + void f() -> renamedF + void g() -> renamedG void keep() -> keep + void m() -> renamedM + void m(int) -> renamedM diff --git a/jack-tests/tests/com/android/jack/shrob/test015/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test015/proguard.flags001.mapping index 83bfd4a..76594dd 100644 --- a/jack-tests/tests/com/android/jack/shrob/test015/proguard.flags001.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test015/proguard.flags001.mapping @@ -1,6 +1,6 @@ -com.android.jack.shrob.test015.jack.A -> a.a.a.a.a.a.a: - 23:23:com.android.jack.shrob.test015.jack.B m() -> a - 28:28:void m(com.android.jack.shrob.test015.jack.A) -> a -com.android.jack.shrob.test015.jack.A$I -> a.a.a.a.a.a.a$a: -com.android.jack.shrob.test015.jack.A$J -> a.a.a.a.a.a.a$b: -com.android.jack.shrob.test015.jack.B -> a.a.a.a.a.a.b: +com.android.jack.shrob.test015.jack.A -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest015.renamedJack.RenamedA: + 23:23:com.android.jack.shrob.test015.jack.B m() -> renamedM + 28:28:void m(com.android.jack.shrob.test015.jack.A) -> renamedM +com.android.jack.shrob.test015.jack.A$I -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest015.renamedJack.RenamedA$I: +com.android.jack.shrob.test015.jack.A$J -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest015.renamedJack.RenamedA$J: +com.android.jack.shrob.test015.jack.B -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest015.renamedJack.RenamedB: diff --git a/jack-tests/tests/com/android/jack/shrob/test015/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test015/refsObfuscationWithMapping/expected-001.txt index 41f353e..4f187a6 100644 --- a/jack-tests/tests/com/android/jack/shrob/test015/refsObfuscationWithMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test015/refsObfuscationWithMapping/expected-001.txt @@ -1,8 +1,8 @@ -com.android.jack.shrob.test015.jack.B -> a.a.a.a.a.a.b: +com.android.jack.shrob.test015.jack.B -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest015.renamedJack.RenamedB: void <init>() -> <init> -com.android.jack.shrob.test015.jack.A -> a.a.a.a.a.a.a: +com.android.jack.shrob.test015.jack.A -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest015.renamedJack.RenamedA: void <init>() -> <init> - com.android.jack.shrob.test015.jack.B m() -> a - void m(com.android.jack.shrob.test015.jack.A) -> a -com.android.jack.shrob.test015.jack.A$I -> a.a.a.a.a.a.a$a: -com.android.jack.shrob.test015.jack.A$J -> a.a.a.a.a.a.a$b: + com.android.jack.shrob.test015.jack.B m() -> renamedM + void m(com.android.jack.shrob.test015.jack.A) -> renamedM +com.android.jack.shrob.test015.jack.A$I -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest015.renamedJack.RenamedA$I: +com.android.jack.shrob.test015.jack.A$J -> renamedCom.renamedAndroid.renamedJack.renamedShrob.renamedTest015.renamedJack.RenamedA$J: 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 2a96f6c..74ff488 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,17 +1,22 @@ -com.android.jack.shrob.test016.jack.A -> com.android.jack.shrob.test016.jack.a: -com.android.jack.shrob.test016.jack.Annot -> com.android.jack.shrob.test016.jack.b: - java.lang.String value() -> value -com.android.jack.shrob.test016.jack.Annot2 -> com.android.jack.shrob.test016.jack.c: - java.lang.String value() -> value -com.android.jack.shrob.test016.jack.Annot3 -> com.android.jack.shrob.test016.jack.d: - java.lang.String value() -> value -com.android.jack.shrob.test016.jack.Annot4 -> com.android.jack.shrob.test016.jack.e: - java.lang.String value() -> value -com.android.jack.shrob.test016.jack.Annot5 -> com.android.jack.shrob.test016.jack.f: - java.lang.String value() -> value +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: - 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
\ No newline at end of file + 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 diff --git a/jack-tests/tests/com/android/jack/shrob/test016/proguard.flags002.mapping b/jack-tests/tests/com/android/jack/shrob/test016/proguard.flags002.mapping index 64c97e9..a7ca2bf 100644 --- a/jack-tests/tests/com/android/jack/shrob/test016/proguard.flags002.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test016/proguard.flags002.mapping @@ -1,21 +1,21 @@ -com.android.jack.shrob.test016.jack.A -> com.android.jack.shrob.test016.jack.a: -com.android.jack.shrob.test016.jack.Annot -> com.android.jack.shrob.test016.jack.b: - java.lang.String value() -> a -com.android.jack.shrob.test016.jack.Annot2 -> com.android.jack.shrob.test016.jack.c: - java.lang.String value() -> a -com.android.jack.shrob.test016.jack.Annot3 -> com.android.jack.shrob.test016.jack.d: - java.lang.String value() -> a -com.android.jack.shrob.test016.jack.Annot4 -> com.android.jack.shrob.test016.jack.e: - java.lang.String value() -> a -com.android.jack.shrob.test016.jack.Annot5 -> com.android.jack.shrob.test016.jack.f: - java.lang.String value() -> a +com.android.jack.shrob.test016.jack.A -> com.android.jack.shrob.test016.jack.RenamedA: +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.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 +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.KeepClass -> com.android.jack.shrob.test016.jack.KeepClass: - java.lang.String value() -> a - java.lang.String value2() -> b - java.lang.String value3() -> c - java.lang.String value4() -> d - java.lang.String value5() -> e - java.lang.String value6() -> f - java.lang.String value7() -> g - java.lang.String value8() -> h - java.lang.String value9() -> i
\ No newline at end of file + 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
\ No newline at end of file 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 3eb5acf..bc4aa5c 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.b: - java.lang.String value() -> value +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() -> 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.e: - java.lang.String value() -> value -com.android.jack.shrob.test016.jack.Annot5 -> com.android.jack.shrob.test016.jack.f: - java.lang.String value() -> value -com.android.jack.shrob.test016.jack.A -> com.android.jack.shrob.test016.jack.a: + 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: void <init>() -> <init> -com.android.jack.shrob.test016.jack.Annot2 -> com.android.jack.shrob.test016.jack.c: - java.lang.String value() -> value -com.android.jack.shrob.test016.jack.Annot3 -> com.android.jack.shrob.test016.jack.d: - java.lang.String value() -> value +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 diff --git a/jack-tests/tests/com/android/jack/shrob/test016/refsObfuscationWithMapping/expected-002.txt b/jack-tests/tests/com/android/jack/shrob/test016/refsObfuscationWithMapping/expected-002.txt index cb9d1db..bc4aa5c 100644 --- a/jack-tests/tests/com/android/jack/shrob/test016/refsObfuscationWithMapping/expected-002.txt +++ b/jack-tests/tests/com/android/jack/shrob/test016/refsObfuscationWithMapping/expected-002.txt @@ -1,23 +1,23 @@ -com.android.jack.shrob.test016.jack.Annot -> com.android.jack.shrob.test016.jack.b: - java.lang.String value() -> a +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() -> a - java.lang.String value2() -> b - java.lang.String value3() -> c - java.lang.String value4() -> d - java.lang.String value5() -> e - java.lang.String value6() -> f - java.lang.String value7() -> g - java.lang.String value8() -> h - java.lang.String value9() -> i -com.android.jack.shrob.test016.jack.Annot4 -> com.android.jack.shrob.test016.jack.e: - java.lang.String value() -> a -com.android.jack.shrob.test016.jack.Annot5 -> com.android.jack.shrob.test016.jack.f: - java.lang.String value() -> a -com.android.jack.shrob.test016.jack.A -> com.android.jack.shrob.test016.jack.a: + 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: void <init>() -> <init> -com.android.jack.shrob.test016.jack.Annot2 -> com.android.jack.shrob.test016.jack.c: - java.lang.String value() -> a -com.android.jack.shrob.test016.jack.Annot3 -> com.android.jack.shrob.test016.jack.d: - java.lang.String value() -> a +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 diff --git a/jack-tests/tests/com/android/jack/shrob/test017/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test017/proguard.flags001.mapping index 602f21a..135648c 100644 --- a/jack-tests/tests/com/android/jack/shrob/test017/proguard.flags001.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test017/proguard.flags001.mapping @@ -1,10 +1,10 @@ -com.android.jack.shrob.test017.jack.Reflect2 -> com.android.jack.shrob.test017.jack.a: -com.android.jack.shrob.test017.jack.Reflect2$A -> com.android.jack.shrob.test017.jack.b: -com.android.jack.shrob.test017.jack.Reflect2$B -> com.android.jack.shrob.test017.jack.c: -com.android.jack.shrob.test017.jack.Reflect3 -> com.android.jack.shrob.test017.jack.d: - int fieldPublic -> a - long fieldLong -> b - long fieldLong3 -> c - long fieldLong4 -> d - com.android.jack.shrob.test017.jack.Reflect2$A a -> e - 47:47:void m(com.android.jack.shrob.test017.jack.Reflect2$A) -> a
\ No newline at end of file +com.android.jack.shrob.test017.jack.Reflect2 -> com.android.jack.shrob.test017.jack.RenamedReflect2: +com.android.jack.shrob.test017.jack.Reflect2$A -> com.android.jack.shrob.test017.jack.RenamedReflect2$A: +com.android.jack.shrob.test017.jack.Reflect2$B -> com.android.jack.shrob.test017.jack.RenamedReflect2$B: +com.android.jack.shrob.test017.jack.Reflect3 -> com.android.jack.shrob.test017.jack.RenamedReflect3: + int fieldPublic -> renamedFieldPublic + long fieldLong -> renamedFieldLong + long fieldLong3 -> renamedFieldLong3 + long fieldLong4 -> renamedFieldLong4 + com.android.jack.shrob.test017.jack.Reflect2$A a -> renamedA + 47:47:void m(com.android.jack.shrob.test017.jack.Reflect2$A) -> renamedM
\ No newline at end of file diff --git a/jack-tests/tests/com/android/jack/shrob/test017/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test017/refsObfuscationWithMapping/expected-001.txt index b393f13..8e97b63 100644 --- a/jack-tests/tests/com/android/jack/shrob/test017/refsObfuscationWithMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test017/refsObfuscationWithMapping/expected-001.txt @@ -4,11 +4,11 @@ com.android.jack.shrob.test017.jack.Reflect -> com.android.jack.shrob.test017.ja void keep3() -> keep3 void keep4() -> keep4 void keep5() -> keep5 -com.android.jack.shrob.test017.jack.Reflect3 -> com.android.jack.shrob.test017.jack.d: - int fieldPublic -> a +com.android.jack.shrob.test017.jack.Reflect3 -> com.android.jack.shrob.test017.jack.RenamedReflect3: + int fieldPublic -> renamedFieldPublic void <init>() -> <init> - void m(com.android.jack.shrob.test017.jack.Reflect2$A) -> a -com.android.jack.shrob.test017.jack.Reflect2 -> com.android.jack.shrob.test017.jack.a: + void m(com.android.jack.shrob.test017.jack.Reflect2$A) -> renamedM +com.android.jack.shrob.test017.jack.Reflect2 -> com.android.jack.shrob.test017.jack.RenamedReflect2: void <init>() -> <init> -com.android.jack.shrob.test017.jack.Reflect2$A -> com.android.jack.shrob.test017.jack.b: -com.android.jack.shrob.test017.jack.Reflect2$B -> com.android.jack.shrob.test017.jack.c: +com.android.jack.shrob.test017.jack.Reflect2$A -> com.android.jack.shrob.test017.jack.RenamedReflect2$A: +com.android.jack.shrob.test017.jack.Reflect2$B -> com.android.jack.shrob.test017.jack.RenamedReflect2$B: diff --git a/jack-tests/tests/com/android/jack/shrob/test019/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test019/refsObfuscationWithMapping/expected-001.txt index b108b6f..3d3e14e 100644 --- a/jack-tests/tests/com/android/jack/shrob/test019/refsObfuscationWithMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test019/refsObfuscationWithMapping/expected-001.txt @@ -4,7 +4,7 @@ com.android.jack.shrob.test019.jack.B$Inner2$Inner3 -> com.android.jack.shrob.te void <init>() -> <init> com.android.jack.shrob.test019.jack.B$C$Inner4 -> com.android.jack.shrob.test019.jack.B$C$Inner4: void <init>() -> <init> -com.android.jack.shrob.test019.jack.B$E -> com.android.jack.shrob.test019.jack.a: +com.android.jack.shrob.test019.jack.B$E -> com.android.jack.shrob.test019.jack.RenamedB$E: void <init>() -> <init> com.android.jack.shrob.test019.jack.B$E$1 -> com.android.jack.shrob.test019.jack.B$E$1: void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test021/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test021/proguard.flags001.mapping new file mode 100644 index 0000000..14597dc --- /dev/null +++ b/jack-tests/tests/com/android/jack/shrob/test021/proguard.flags001.mapping @@ -0,0 +1,2 @@ +com.android.jack.shrob.test021.jack.Shrob021$KeptInterface -> com.android.jack.shrob.test021.jack.RenamedShrob021$KeptInterface: + void interfaceMethod() -> renamedInterfaceMethod diff --git a/jack-tests/tests/com/android/jack/shrob/test021/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test021/refsObfuscationWithMapping/expected-001.txt index 9e8e7d8..a923f0f 100644 --- a/jack-tests/tests/com/android/jack/shrob/test021/refsObfuscationWithMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test021/refsObfuscationWithMapping/expected-001.txt @@ -1,5 +1,5 @@ com.android.jack.shrob.test021.jack.Shrob021 -> com.android.jack.shrob.test021.jack.Shrob021: void <init>() -> <init> int toKeep() -> toKeep -com.android.jack.shrob.test021.jack.Shrob021$KeptInterface -> com.android.jack.shrob.test021.jack.a: - void interfaceMethod() -> a +com.android.jack.shrob.test021.jack.Shrob021$KeptInterface -> com.android.jack.shrob.test021.jack.RenamedShrob021$KeptInterface: + void interfaceMethod() -> renamedInterfaceMethod diff --git a/jack-tests/tests/com/android/jack/shrob/test022/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test022/proguard.flags001.mapping new file mode 100644 index 0000000..7ce5a1d --- /dev/null +++ b/jack-tests/tests/com/android/jack/shrob/test022/proguard.flags001.mapping @@ -0,0 +1 @@ +com.android.jack.shrob.test022.jack.AbstractClass -> com.android.jack.shrob.test022.jack.RenamedAbstractClass: diff --git a/jack-tests/tests/com/android/jack/shrob/test022/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test022/refsObfuscationWithMapping/expected-001.txt index c0c3b70..21d2582 100644 --- a/jack-tests/tests/com/android/jack/shrob/test022/refsObfuscationWithMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test022/refsObfuscationWithMapping/expected-001.txt @@ -1,5 +1,5 @@ com.android.jack.shrob.test022.jack.Shrob022 -> com.android.jack.shrob.test022.jack.Shrob022: void <init>() -> <init> void method() -> method -com.android.jack.shrob.test022.jack.AbstractClass -> com.android.jack.shrob.test022.jack.a: +com.android.jack.shrob.test022.jack.AbstractClass -> com.android.jack.shrob.test022.jack.RenamedAbstractClass: void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test023/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test023/proguard.flags001.mapping new file mode 100644 index 0000000..b5eb082 --- /dev/null +++ b/jack-tests/tests/com/android/jack/shrob/test023/proguard.flags001.mapping @@ -0,0 +1,3 @@ +com.android.jack.shrob.test023.jack.Outer$Inner -> com.android.jack.shrob.test023.jack.Outer$Inner: + void m() -> renamedM + void m2() -> renamedM2 diff --git a/jack-tests/tests/com/android/jack/shrob/test023/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test023/refsObfuscationWithMapping/expected-001.txt index c3debfc..ae96dbb 100644 --- a/jack-tests/tests/com/android/jack/shrob/test023/refsObfuscationWithMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test023/refsObfuscationWithMapping/expected-001.txt @@ -1,5 +1,5 @@ com.android.jack.shrob.test023.jack.Outer$Inner -> com.android.jack.shrob.test023.jack.Outer$Inner: void <init>() -> <init> void <init>(int) -> <init> - void m() -> a - void m2() -> b + void m() -> renamedM + void m2() -> renamedM2 diff --git a/jack-tests/tests/com/android/jack/shrob/test025/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test025/refsObfuscationWithMapping/expected-001.txt index c297699..0072c41 100644 --- a/jack-tests/tests/com/android/jack/shrob/test025/refsObfuscationWithMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test025/refsObfuscationWithMapping/expected-001.txt @@ -1,7 +1,7 @@ com.android.jack.shrob.test025.jack.Keep -> com.android.jack.shrob.test025.jack.Keep: void <init>() -> <init> - java.lang.String m(java.lang.String) -> m java.lang.String keep() -> keep + java.lang.String m(java.lang.String) -> m com.android.jack.shrob.test025.jack.A$I -> com.android.jack.shrob.test025.jack.A$I: com.android.jack.shrob.test025.jack.A$I2 -> com.android.jack.shrob.test025.jack.A$I2: java.lang.String s -> s diff --git a/jack-tests/tests/com/android/jack/shrob/test026/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test026/proguard.flags001.mapping new file mode 100644 index 0000000..5a7008f --- /dev/null +++ b/jack-tests/tests/com/android/jack/shrob/test026/proguard.flags001.mapping @@ -0,0 +1,2 @@ +com.android.jack.shrob.test026.jack.Enum -> com.android.jack.shrob.test026.jack.Enum: + com.android.jack.shrob.test026.jack.Enum[] $VALUES -> renamed$VALUES
\ No newline at end of file diff --git a/jack-tests/tests/com/android/jack/shrob/test026/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test026/refsObfuscationWithMapping/expected-001.txt index c64557f..f41d8e6 100644 --- a/jack-tests/tests/com/android/jack/shrob/test026/refsObfuscationWithMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test026/refsObfuscationWithMapping/expected-001.txt @@ -1,5 +1,5 @@ com.android.jack.shrob.test026.jack.Enum -> com.android.jack.shrob.test026.jack.Enum: - com.android.jack.shrob.test026.jack.Enum[] $VALUES -> a - void <clinit>() -> <clinit> + com.android.jack.shrob.test026.jack.Enum[] $VALUES -> renamed$VALUES com.android.jack.shrob.test026.jack.Enum valueOf(java.lang.String) -> valueOf com.android.jack.shrob.test026.jack.Enum[] values() -> values + void <clinit>() -> <clinit> diff --git a/jack-tests/tests/com/android/jack/shrob/test027/lib/ForName.class b/jack-tests/tests/com/android/jack/shrob/test027/lib/ForName.class Binary files differdeleted file mode 100644 index be729ee..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test027/lib/ForName.class +++ /dev/null diff --git a/jack-tests/tests/com/android/jack/shrob/test027/proguard.flags001 b/jack-tests/tests/com/android/jack/shrob/test027/proguard.flags001 deleted file mode 100644 index 0be8a6a..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test027/proguard.flags001 +++ /dev/null @@ -1,3 +0,0 @@ --keep class **.ForName { - *; -}
\ No newline at end of file diff --git a/jack-tests/tests/com/android/jack/shrob/test027/refsShrinking/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test027/refsShrinking/expected-001.txt deleted file mode 100644 index 8525ee8..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test027/refsShrinking/expected-001.txt +++ /dev/null @@ -1,5 +0,0 @@ -Lcom/android/jack/shrob/test027/jack/A;: -<init>()V -Lcom/android/jack/shrob/test027/lib/ForName;: -<init>()V -keptMethod()Ljava/lang/Class; diff --git a/jack-tests/tests/com/android/jack/shrob/test029/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test029/proguard.flags001.mapping index 11178a1..4d69ede 100644 --- a/jack-tests/tests/com/android/jack/shrob/test029/proguard.flags001.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test029/proguard.flags001.mapping @@ -1,5 +1,5 @@ -com.android.jack.shrob.test029.jack.I -> com.android.jack.shrob.test029.jack.a: -com.android.jack.shrob.test029.jack.B -> com.android.jack.shrob.test029.jack.b: - com.android.jack.shrob.test029.jack.B get(com.android.jack.shrob.test029.jack.I) -> a -com.android.jack.shrob.test029.jack.C -> com.android.jack.shrob.test029.jack.c: -com.android.jack.shrob.test029.jack.A -> com.android.jack.shrob.test029.jack.d: +com.android.jack.shrob.test029.jack.I -> com.android.jack.shrob.test029.jack.RenamedI: +com.android.jack.shrob.test029.jack.B -> com.android.jack.shrob.test029.jack.RenamedB: + com.android.jack.shrob.test029.jack.B get(com.android.jack.shrob.test029.jack.I) -> renamedGet +com.android.jack.shrob.test029.jack.C -> com.android.jack.shrob.test029.jack.RenamedC: +com.android.jack.shrob.test029.jack.A -> com.android.jack.shrob.test029.jack.RenamedA: diff --git a/jack-tests/tests/com/android/jack/shrob/test029/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test029/refsObfuscationWithMapping/expected-001.txt index b3feff8..2b074ac 100644 --- a/jack-tests/tests/com/android/jack/shrob/test029/refsObfuscationWithMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test029/refsObfuscationWithMapping/expected-001.txt @@ -1,12 +1,12 @@ com.android.jack.shrob.test029.jack.Kept -> com.android.jack.shrob.test029.jack.Kept: void <init>() -> <init> void kept() -> kept -com.android.jack.shrob.test029.jack.I -> com.android.jack.shrob.test029.jack.a: +com.android.jack.shrob.test029.jack.I -> com.android.jack.shrob.test029.jack.RenamedI: void <init>() -> <init> -com.android.jack.shrob.test029.jack.B -> com.android.jack.shrob.test029.jack.b: +com.android.jack.shrob.test029.jack.B -> com.android.jack.shrob.test029.jack.RenamedB: void <init>() -> <init> - com.android.jack.shrob.test029.jack.B get(com.android.jack.shrob.test029.jack.I) -> a -com.android.jack.shrob.test029.jack.C -> com.android.jack.shrob.test029.jack.c: + com.android.jack.shrob.test029.jack.B get(com.android.jack.shrob.test029.jack.I) -> renamedGet +com.android.jack.shrob.test029.jack.C -> com.android.jack.shrob.test029.jack.RenamedC: void <init>() -> <init> -com.android.jack.shrob.test029.jack.A -> com.android.jack.shrob.test029.jack.d: +com.android.jack.shrob.test029.jack.A -> com.android.jack.shrob.test029.jack.RenamedA: void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test030/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test030/proguard.flags001.mapping index a8740da..7f9b50c 100644 --- a/jack-tests/tests/com/android/jack/shrob/test030/proguard.flags001.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test030/proguard.flags001.mapping @@ -1,4 +1,4 @@ -com.android.jack.shrob.test030.jack.I -> com.android.jack.shrob.test030.jack.a: - int m() -> a -com.android.jack.shrob.test030.jack.A -> com.android.jack.shrob.test030.jack.b: - int m() -> a +com.android.jack.shrob.test030.jack.Kept -> com.android.jack.shrob.test030.jack.Kept: +com.android.jack.shrob.test030.jack.I -> com.android.jack.shrob.test030.jack.RenamedI: +com.android.jack.shrob.test030.jack.A -> com.android.jack.shrob.test030.jack.RenamedA: + int m() -> renamedM diff --git a/jack-tests/tests/com/android/jack/shrob/test030/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test030/refsObfuscationWithMapping/expected-001.txt index 5ba496e..2419711 100644 --- a/jack-tests/tests/com/android/jack/shrob/test030/refsObfuscationWithMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test030/refsObfuscationWithMapping/expected-001.txt @@ -1,10 +1,10 @@ com.android.jack.shrob.test030.jack.Kept -> com.android.jack.shrob.test030.jack.Kept: void <init>() -> <init> int kept(com.android.jack.shrob.test030.jack.I) -> kept -com.android.jack.shrob.test030.jack.I -> com.android.jack.shrob.test030.jack.a: - int m() -> a +com.android.jack.shrob.test030.jack.I -> com.android.jack.shrob.test030.jack.RenamedI: + int m() -> renamedM com.android.jack.shrob.test030.jack.B -> com.android.jack.shrob.test030.jack.B: void <init>() -> <init> -com.android.jack.shrob.test030.jack.A -> com.android.jack.shrob.test030.jack.b: +com.android.jack.shrob.test030.jack.A -> com.android.jack.shrob.test030.jack.RenamedA: void <init>() -> <init> - int m() -> a + int m() -> renamedM diff --git a/jack-tests/tests/com/android/jack/shrob/test031/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test031/proguard.flags001.mapping index 6a76a4c..09aa9cc 100644 --- a/jack-tests/tests/com/android/jack/shrob/test031/proguard.flags001.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test031/proguard.flags001.mapping @@ -1,16 +1,4 @@ -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 +com.android.jack.shrob.test031.jack.I -> com.android.jack.shrob.test031.jack.RenamedI: + int m() -> renamedM +com.android.jack.shrob.test031.jack.F -> com.android.jack.shrob.test031.jack.RenamedF: +com.android.jack.shrob.test031.jack.A -> com.android.jack.shrob.test031.jack.RenamedA: diff --git a/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithMapping/expected-001.txt index d5d1daf..89eb0ed 100644 --- a/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithMapping/expected-001.txt @@ -3,14 +3,14 @@ com.android.jack.shrob.test031.jack.E -> com.android.jack.shrob.test031.jack.E: 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: +com.android.jack.shrob.test031.jack.I -> com.android.jack.shrob.test031.jack.RenamedI: + int m() -> renamedM +com.android.jack.shrob.test031.jack.F -> com.android.jack.shrob.test031.jack.RenamedF: 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: +com.android.jack.shrob.test031.jack.A -> com.android.jack.shrob.test031.jack.RenamedA: void <init>() -> <init> - int m() -> a + int m() -> renamedM diff --git a/jack-tests/tests/com/android/jack/shrob/test032/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test032/proguard.flags001.mapping index ac19db9..80c9322 100644 --- a/jack-tests/tests/com/android/jack/shrob/test032/proguard.flags001.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test032/proguard.flags001.mapping @@ -1,4 +1,4 @@ -com.android.jack.shrob.test032.jack.I -> com.android.jack.shrob.test032.jack.a: -com.android.jack.shrob.test032.jack.B -> com.android.jack.shrob.test032.jack.b: -com.android.jack.shrob.test032.jack.A -> com.android.jack.shrob.test032.jack.c: - int m() -> a +com.android.jack.shrob.test032.jack.I -> com.android.jack.shrob.test032.jack.RenamedI: +com.android.jack.shrob.test032.jack.B -> com.android.jack.shrob.test032.jack.RenamedB: +com.android.jack.shrob.test032.jack.A -> com.android.jack.shrob.test032.jack.RenamedA: + int m() -> renamedM diff --git a/jack-tests/tests/com/android/jack/shrob/test032/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test032/refsObfuscationWithMapping/expected-001.txt index c9a8f93..1f831ef 100644 --- a/jack-tests/tests/com/android/jack/shrob/test032/refsObfuscationWithMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test032/refsObfuscationWithMapping/expected-001.txt @@ -1,13 +1,13 @@ com.android.jack.shrob.test032.jack.Kept -> com.android.jack.shrob.test032.jack.Kept: void <init>() -> <init> int kept(com.android.jack.shrob.test032.jack.I) -> kept -com.android.jack.shrob.test032.jack.I -> com.android.jack.shrob.test032.jack.a: - int m() -> a -com.android.jack.shrob.test032.jack.B -> com.android.jack.shrob.test032.jack.b: +com.android.jack.shrob.test032.jack.I -> com.android.jack.shrob.test032.jack.RenamedI: + int m() -> renamedM +com.android.jack.shrob.test032.jack.B -> com.android.jack.shrob.test032.jack.RenamedB: void <init>() -> <init> com.android.jack.shrob.test032.jack.C -> com.android.jack.shrob.test032.jack.C: void <init>() -> <init> - int m() -> a -com.android.jack.shrob.test032.jack.A -> com.android.jack.shrob.test032.jack.c: + int m() -> renamedM +com.android.jack.shrob.test032.jack.A -> com.android.jack.shrob.test032.jack.RenamedA: void <init>() -> <init> - int m() -> a + int m() -> renamedM diff --git a/jack-tests/tests/com/android/jack/shrob/test036/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test036/proguard.flags001.mapping new file mode 100644 index 0000000..8b692a9 --- /dev/null +++ b/jack-tests/tests/com/android/jack/shrob/test036/proguard.flags001.mapping @@ -0,0 +1,8 @@ +com.android.jack.shrob.test036.jack.E -> com.android.jack.shrob.test036.jack.RenamedE: + com.android.jack.shrob.test036.jack.E A -> renamedA + com.android.jack.shrob.test036.jack.E B -> renamedB + com.android.jack.shrob.test036.jack.E C -> renamedC + com.android.jack.shrob.test036.jack.E[] $VALUES -> renamed$VALUES + void <init>(java.lang.String,int) -> renamed<init> + com.android.jack.shrob.test036.jack.E[] values() -> renamedValues + void <clinit>() -> renamed<clinit> diff --git a/jack-tests/tests/com/android/jack/shrob/test036/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test036/refsObfuscationWithMapping/expected-001.txt index b024d02..1d7594a 100644 --- a/jack-tests/tests/com/android/jack/shrob/test036/refsObfuscationWithMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test036/refsObfuscationWithMapping/expected-001.txt @@ -1,10 +1,10 @@ -com.android.jack.shrob.test036.jack.E -> com.android.jack.shrob.test036.jack.a: - com.android.jack.shrob.test036.jack.E A -> a - com.android.jack.shrob.test036.jack.E B -> b - com.android.jack.shrob.test036.jack.E C -> c - com.android.jack.shrob.test036.jack.E[] $VALUES -> d +com.android.jack.shrob.test036.jack.E -> com.android.jack.shrob.test036.jack.RenamedE: + com.android.jack.shrob.test036.jack.E A -> renamedA + com.android.jack.shrob.test036.jack.E B -> renamedB + com.android.jack.shrob.test036.jack.E C -> renamedC + com.android.jack.shrob.test036.jack.E[] $VALUES -> renamed$VALUES void <init>(java.lang.String,int) -> <init> - com.android.jack.shrob.test036.jack.E[] values() -> a + com.android.jack.shrob.test036.jack.E[] values() -> renamedValues void <clinit>() -> <clinit> com.android.jack.shrob.test036.jack.Kept -> com.android.jack.shrob.test036.jack.Kept: int[] -ESwitchesValues -> -ESwitchesValues diff --git a/jack-tests/tests/com/android/jack/shrob/test037/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test037/proguard.flags001.mapping index c6b7a14..34627fe 100644 --- a/jack-tests/tests/com/android/jack/shrob/test037/proguard.flags001.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test037/proguard.flags001.mapping @@ -1,3 +1,3 @@ -com.android.jack.shrob.test037.jack.B -> com.android.jack.shrob.test037.jack.a: - void m() -> a -com.android.jack.shrob.test037.jack.A -> com.android.jack.shrob.test037.jack.b: +com.android.jack.shrob.test037.jack.B -> com.android.jack.shrob.test037.jack.RenamedB: + void m() -> renamedM +com.android.jack.shrob.test037.jack.A -> com.android.jack.shrob.test037.jack.RenamedA: diff --git a/jack-tests/tests/com/android/jack/shrob/test037/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test037/refsObfuscationWithMapping/expected-001.txt index b4e8d03..e060833 100644 --- a/jack-tests/tests/com/android/jack/shrob/test037/refsObfuscationWithMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test037/refsObfuscationWithMapping/expected-001.txt @@ -1,8 +1,8 @@ com.android.jack.shrob.test037.jack.Kept -> com.android.jack.shrob.test037.jack.Kept: void <init>() -> <init> void kept() -> kept -com.android.jack.shrob.test037.jack.B -> com.android.jack.shrob.test037.jack.a: +com.android.jack.shrob.test037.jack.B -> com.android.jack.shrob.test037.jack.RenamedB: void <init>() -> <init> - void m() -> a -com.android.jack.shrob.test037.jack.A -> com.android.jack.shrob.test037.jack.b: + void m() -> renamedM +com.android.jack.shrob.test037.jack.A -> com.android.jack.shrob.test037.jack.RenamedA: void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test038/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test038/proguard.flags001.mapping new file mode 100644 index 0000000..820fbe8 --- /dev/null +++ b/jack-tests/tests/com/android/jack/shrob/test038/proguard.flags001.mapping @@ -0,0 +1,5 @@ +com.android.jack.shrob.test038.jack.Kept -> com.android.jack.shrob.test038.jack.Kept: + void <init>() -> <init> + void kept() -> kept +com.android.jack.shrob.test038.jack.Element -> com.android.jack.shrob.test038.jack.RenamedElement: + void <init>() -> <init> diff --git a/jack-tests/tests/com/android/jack/shrob/test038/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test038/refsObfuscationWithMapping/expected-001.txt index db5c11e..820fbe8 100644 --- a/jack-tests/tests/com/android/jack/shrob/test038/refsObfuscationWithMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test038/refsObfuscationWithMapping/expected-001.txt @@ -1,5 +1,5 @@ com.android.jack.shrob.test038.jack.Kept -> com.android.jack.shrob.test038.jack.Kept: void <init>() -> <init> void kept() -> kept -com.android.jack.shrob.test038.jack.Element -> com.android.jack.shrob.test038.jack.a: +com.android.jack.shrob.test038.jack.Element -> com.android.jack.shrob.test038.jack.RenamedElement: void <init>() -> <init> |