)]}' { "commit": "eafc2dabd035381eb09844a12c6e11bc317ad0cd", "tree": "ba672a3300ccf054b302bff3a943d1e341a9c47e", "parents": [ "db845e3ffe68c2d256c91c290c0ad2f0f445c24f" ], "author": { "name": "Morten Krogh-Jespersen", "email": "mkroghj@google.com", "time": "Tue May 14 09:25:45 2019 +0200" }, "committer": { "name": "Morten Krogh-Jespersen", "email": "mkroghj@google.com", "time": "Tue May 14 09:25:45 2019 +0200" }, "message": "Version 1.4.96\n\nThe following changes is made directly on the branch since this\nversion of applymapping is no longer on newer branches.\n\n- Allow for duplicate names for static fields and methods in mapping.\n\n- Rewrite Signature annotation when doing applymapping.\n\nThe tests are also present on the master branch and cherry-picked:\n\nCherry pick: Add test for rewriting signatures when using applymapping\nhttps://r8-review.googlesource.com/c/r8/+/38232\n\nCherry pick: Test using -applymapping with same static methods in type\nhierarchy\nhttps://r8-review.googlesource.com/c/r8/+/38280\n\nBug: 131532229\nBug: 131710444\nBug: 132593471\nChange-Id: Ic89436f623e8ee12321105e1cbb722f1d0686252", "tree_diff": [ { "type": "modify", "old_id": "356d63df9227c580ebea031d6beb02ea81fce2eb", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/Version.java", "new_id": "0190082a0e3b161d011e4ed0067d7cfe13ac3d39", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/Version.java" }, { "type": "modify", "old_id": "78dad0267c12b08e02f5983d30919fc6b9d0eb86", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/naming/ProguardMapApplier.java", "new_id": "7b7a67f00095983056d6d8d053abe26ed8a22853", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/naming/ProguardMapApplier.java" }, { "type": "modify", "old_id": "20f4bc211fb00274221e64a32aeb3f9b4c71ced5", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/naming/signature/GenericSignatureRewriter.java", "new_id": "3f331ff93adae1be5a06d24173381fa39516d16d", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/naming/signature/GenericSignatureRewriter.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "d74692bd88ea7d735f1febf2af5bc65a704a2f57", "new_mode": 33188, "new_path": "src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingSameStaticNameTest.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "f36eef2034e22a0d646545a526158abed060b89a", "new_mode": 33188, "new_path": "src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingSignatureTest.java" } ] }