)]}'
{
  "commit": "1188c195bc5fb277e7cd59572c674bb06ba23f6a",
  "tree": "d442a4815355ac6889debaf08d8987a9afed8f0a",
  "parents": [
    "989f4601adb3b754481e09196fa97431c45d8c8f"
  ],
  "author": {
    "name": "Christoffer Quist Adamsen",
    "email": "christofferqa@google.com",
    "time": "Thu May 20 13:31:58 2021 +0200"
  },
  "committer": {
    "name": "Christoffer Quist Adamsen",
    "email": "christofferqa@google.com",
    "time": "Thu May 20 11:33:05 2021 +0000"
  },
  "message": "Revert \"Enable interface merging in second round of class merging\"\n\nThis reverts commit 86a5ef0da87c5952e08c7e5e3afaa0f51a729dd0.\n\nReason for revert: Breaks compose sample app\n\nChange-Id: I0fe46f1ba82c6d0c3f6cd1e33df5a1f109c7c501\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "4ef90be8ba2dd6fafae7996d55485571faf21c6f",
      "old_mode": 33188,
      "old_path": "src/main/java/com/android/tools/r8/graph/AppView.java",
      "new_id": "bf21997ff643045fa155ea27a9da91587564b180",
      "new_mode": 33188,
      "new_path": "src/main/java/com/android/tools/r8/graph/AppView.java"
    },
    {
      "type": "modify",
      "old_id": "685188e8d02c4f6ad7c47b47bb0bc6fc05f0e22f",
      "old_mode": 33188,
      "old_path": "src/main/java/com/android/tools/r8/graph/BottomUpClassHierarchyTraversal.java",
      "new_id": "1c7bf889c595ba1ec98ea387e63a02c452099e6f",
      "new_mode": 33188,
      "new_path": "src/main/java/com/android/tools/r8/graph/BottomUpClassHierarchyTraversal.java"
    },
    {
      "type": "modify",
      "old_id": "8abd2eca178bc7dd6268b54cfebc464ae3ae08fd",
      "old_mode": 33188,
      "old_path": "src/main/java/com/android/tools/r8/graph/GraphLens.java",
      "new_id": "ff2fd57c98ead1ce71318e63f07797ae67c2faf9",
      "new_mode": 33188,
      "new_path": "src/main/java/com/android/tools/r8/graph/GraphLens.java"
    },
    {
      "type": "modify",
      "old_id": "4b025589f9f309fd6a34002cfbc97cdc191bc6fd",
      "old_mode": 33188,
      "old_path": "src/main/java/com/android/tools/r8/horizontalclassmerging/ClassMerger.java",
      "new_id": "2b659506eaaecf1327b90b65400ba06288aa687c",
      "new_mode": 33188,
      "new_path": "src/main/java/com/android/tools/r8/horizontalclassmerging/ClassMerger.java"
    },
    {
      "type": "modify",
      "old_id": "ba5d775ec8fd0105e513246398be52110c2f02a4",
      "old_mode": 33188,
      "old_path": "src/main/java/com/android/tools/r8/horizontalclassmerging/MergeGroup.java",
      "new_id": "b226b727e579272c97520eb9d1e6b53546e738c7",
      "new_mode": 33188,
      "new_path": "src/main/java/com/android/tools/r8/horizontalclassmerging/MergeGroup.java"
    },
    {
      "type": "modify",
      "old_id": "a2362bd6c13239966aa75cd06554aa9d27f65e1c",
      "old_mode": 33188,
      "old_path": "src/main/java/com/android/tools/r8/horizontalclassmerging/policies/NoDefaultInterfaceMethodCollisions.java",
      "new_id": "b0912425bf6b3f6d32eaea480ec2000679dbf826",
      "new_mode": 33188,
      "new_path": "src/main/java/com/android/tools/r8/horizontalclassmerging/policies/NoDefaultInterfaceMethodCollisions.java"
    },
    {
      "type": "modify",
      "old_id": "fc457f7f230ff71bd0cf0fcfc7da187917b4b99e",
      "old_mode": 33188,
      "old_path": "src/main/java/com/android/tools/r8/horizontalclassmerging/policies/OnlyDirectlyConnectedOrUnrelatedInterfaces.java",
      "new_id": "d9e6cd1395227205a7df4ddb518c80ffb9558e92",
      "new_mode": 33188,
      "new_path": "src/main/java/com/android/tools/r8/horizontalclassmerging/policies/OnlyDirectlyConnectedOrUnrelatedInterfaces.java"
    },
    {
      "type": "modify",
      "old_id": "0fdc4996527924d78bd6f919f3840b56ff862ba0",
      "old_mode": 33188,
      "old_path": "src/main/java/com/android/tools/r8/optimize/MemberRebindingIdentityLens.java",
      "new_id": "3f77dbbb579c1dd58e5ff8d4d45a4fe88f30db0f",
      "new_mode": 33188,
      "new_path": "src/main/java/com/android/tools/r8/optimize/MemberRebindingIdentityLens.java"
    },
    {
      "type": "modify",
      "old_id": "d202af8ac9f933933f519ccf417eb93268a9f96f",
      "old_mode": 33188,
      "old_path": "src/main/java/com/android/tools/r8/optimize/MemberRebindingLens.java",
      "new_id": "4310236d93bd3d89573360c0757248ba3fc64682",
      "new_mode": 33188,
      "new_path": "src/main/java/com/android/tools/r8/optimize/MemberRebindingLens.java"
    },
    {
      "type": "modify",
      "old_id": "836c9c419516030f52e8c42d317dd85696e62197",
      "old_mode": 33188,
      "old_path": "src/main/java/com/android/tools/r8/utils/InternalOptions.java",
      "new_id": "849d6416e1c97e53c5ad0ded21c84793b76a8dd8",
      "new_mode": 33188,
      "new_path": "src/main/java/com/android/tools/r8/utils/InternalOptions.java"
    },
    {
      "type": "modify",
      "old_id": "fc3914602df5c87fa2fe9e6dddfc89c3b79d7de0",
      "old_mode": 33188,
      "old_path": "src/main/java/com/android/tools/r8/utils/MapUtils.java",
      "new_id": "63e881e61de291d8938ce05ebaf32c57321c7717",
      "new_mode": 33188,
      "new_path": "src/main/java/com/android/tools/r8/utils/MapUtils.java"
    },
    {
      "type": "modify",
      "old_id": "67e4148fc731101ff034ce645e31847e34a8d06c",
      "old_mode": 33188,
      "old_path": "src/main/java/com/android/tools/r8/utils/WorkList.java",
      "new_id": "4279cb70d48c6db8155fd1ad6a516d793939af68",
      "new_mode": 33188,
      "new_path": "src/main/java/com/android/tools/r8/utils/WorkList.java"
    },
    {
      "type": "delete",
      "old_id": "3b7a831252ec9267c6b5ba94538cc5f492e6b723",
      "old_mode": 33188,
      "old_path": "src/test/examples/classmerging/NoHorizontalClassMerging.java",
      "new_id": "0000000000000000000000000000000000000000",
      "new_mode": 0,
      "new_path": "/dev/null"
    },
    {
      "type": "modify",
      "old_id": "804b4ed4dfe35d82e5b094f976c49b01bae2395e",
      "old_mode": 33188,
      "old_path": "src/test/examples/classmerging/SimpleInterfaceAccessTest.java",
      "new_id": "6fde90e28a44c0066e4b7301e19f997aa3b147f3",
      "new_mode": 33188,
      "new_path": "src/test/examples/classmerging/SimpleInterfaceAccessTest.java"
    },
    {
      "type": "modify",
      "old_id": "46fcb9144b0e02de89d33f57bdfbde21dd821b81",
      "old_mode": 33188,
      "old_path": "src/test/examples/classmerging/keep-rules.txt",
      "new_id": "64ce874b89ac02c23f2ab5fbba2b1ccd7584c115",
      "new_mode": 33188,
      "new_path": "src/test/examples/classmerging/keep-rules.txt"
    },
    {
      "type": "modify",
      "old_id": "6fad8620f81f21454a1cd3e40404035c3611f4df",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/InnerOuterClassesTest.java",
      "new_id": "8a80d6e3633cfa5fb2ef06c8706c6f0e50e4a89e",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/InnerOuterClassesTest.java"
    },
    {
      "type": "modify",
      "old_id": "0844722df195ed18fd0ca879c5157e8dc8b2df28",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/NestClassMergingTestRunner.java",
      "new_id": "bf50ab1472aedd9d07fd5031fd49c9de567d41f1",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/NestClassMergingTestRunner.java"
    },
    {
      "type": "modify",
      "old_id": "955ff04881e027d9bed9766c077664d82d5bdb1b",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideAbstractMethodWithDefaultTest.java",
      "new_id": "3787201c9adc511b9bfd5dcd84b171e9b52e29f7",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideAbstractMethodWithDefaultTest.java"
    },
    {
      "type": "modify",
      "old_id": "0af1e8508e07ba4e3d5b881c5398b92a451d9e32",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideDefaultMethodTest.java",
      "new_id": "580598ba6977f713a6d9d6fd57801e547b162cb2",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideDefaultMethodTest.java"
    },
    {
      "type": "modify",
      "old_id": "7b5437e415e6bc2aa5339bff00dc1d86c20a3d48",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideDefaultOnSuperMethodTest.java",
      "new_id": "65ca772147b9406453a07a3b25de0e412cd30000",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideDefaultOnSuperMethodTest.java"
    },
    {
      "type": "modify",
      "old_id": "4d81f1aae9e2371d460da603f7db6e4c3c942bf3",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/ClassHierarchyCycleAfterMergingTest.java",
      "new_id": "650d804e187466bc234808d3e7357963ed197189",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/ClassHierarchyCycleAfterMergingTest.java"
    },
    {
      "type": "modify",
      "old_id": "cc19dd28bad0a7017b8b84e49b60ed0954aeeada",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupAfterSubclassMergingTest.java",
      "new_id": "1c5d9150fdf1c3ca05f8fd46963375b655a539b9",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupAfterSubclassMergingTest.java"
    },
    {
      "type": "modify",
      "old_id": "dca511f3a99a721842c90e0ca27b69a49d96c47e",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupClassTest.java",
      "new_id": "d4f14bd107fbcc07e25ccff2546c8ba4d90ea749",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupClassTest.java"
    },
    {
      "type": "modify",
      "old_id": "62cf2567772f0e7b68108e6872ae575be964e817",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupLambdaTest.java",
      "new_id": "f9e85ba5dce8fc33ca688f46b9ad1a050ed79cca",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupLambdaTest.java"
    },
    {
      "type": "modify",
      "old_id": "e8bd34f04328cb44178528e0604e57f9c89f4c1d",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesMergingTest.java",
      "new_id": "7ca9cc50fc0c47c2181efae59910b283eee00c2e",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesMergingTest.java"
    },
    {
      "type": "modify",
      "old_id": "a88f6c1555225b1e302718373a9b21682ddccacd",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithIntersectionMergingTest.java",
      "new_id": "dad75a47aa8a952a5477f6a1564833d7aca3baf0",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithIntersectionMergingTest.java"
    },
    {
      "type": "modify",
      "old_id": "dae6f365a0d623181c90b47621a244d907be2ace",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithSameNameAndDifferentParametersMergingTest.java",
      "new_id": "e58ca16628a676ec1308ab90b63c28ac00413435",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithSameNameAndDifferentParametersMergingTest.java"
    },
    {
      "type": "modify",
      "old_id": "e0022638aa09abd116461f534c131b9f34e5af57",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithSameNameAndDifferentReturnTypeMergingTest.java",
      "new_id": "a8771219e7a52a99e9ea88e6ae22aea878ceb332",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithSameNameAndDifferentReturnTypeMergingTest.java"
    },
    {
      "type": "modify",
      "old_id": "ef6ac6701b332c082c3120a7fae9a9ae5e60490d",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointInterfacesWithDefaultMethodsMergingTest.java",
      "new_id": "08075476b878c89b49476d4ee4eee7cf61f77113",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointInterfacesWithDefaultMethodsMergingTest.java"
    },
    {
      "type": "modify",
      "old_id": "f33ec1c52d2e75a9ed7531d2d872d7b5cb885d9a",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointInterfacesWithoutDefaultMethodsMergingTest.java",
      "new_id": "5f30eff893df9f925312b215401d5a7da44f78c7",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointInterfacesWithoutDefaultMethodsMergingTest.java"
    },
    {
      "type": "delete",
      "old_id": "80160a4d6d02020a2844f60131facbed9edf4dd2",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/EmptyInterfaceChainMergingTest.java",
      "new_id": "0000000000000000000000000000000000000000",
      "new_mode": 0,
      "new_path": "/dev/null"
    },
    {
      "type": "modify",
      "old_id": "7cbdad2512aea856201c3b6fa6c7640255c9cab6",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/EmptyInterfacesMergingTest.java",
      "new_id": "24e5de89b712109ffbf9ee1cc7446f199e134a0b",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/EmptyInterfacesMergingTest.java"
    },
    {
      "type": "modify",
      "old_id": "f13b7e0f0c3c808b1185dea0daa85cf70b9f7983",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IdenticalFunctionalInterfacesMergingTest.java",
      "new_id": "2d264dbedb1b894df2716aef6ab9be46018036d1",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IdenticalFunctionalInterfacesMergingTest.java"
    },
    {
      "type": "modify",
      "old_id": "d529fc95efd90a65828af3b54eab0e1b3f74ffd6",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IdenticalFunctionalInterfacesWithIntersectionMergingTest.java",
      "new_id": "23ed1ea0836b2a1238d9212f053adf9c8b0b1c03",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IdenticalFunctionalInterfacesWithIntersectionMergingTest.java"
    },
    {
      "type": "modify",
      "old_id": "e8630bb53abbf4fe8d7719fdf0d20aa1348e3828",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/NoDefaultMethodMergingTest.java",
      "new_id": "6ad6ef17b3a5c4245aa8b6fa549d2a3dba01b930",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/NoDefaultMethodMergingTest.java"
    },
    {
      "type": "modify",
      "old_id": "6905202f58fbdfacb9aaa31fcdfbe35bcad99dce",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerInterfaceTest.java",
      "new_id": "1c33206c11d621e2122f08de1ece5cf999a91664",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerInterfaceTest.java"
    },
    {
      "type": "modify",
      "old_id": "2f157d0ba9cd104463b8d76b5de0f52053e82238",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerTest.java",
      "new_id": "5468cae939b3857dacc5fd7dce9b8cfa4e3e1763",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerTest.java"
    },
    {
      "type": "modify",
      "old_id": "71ddab87e4bd13c76848c2365a4363d60cf0a661",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/dexsplitter/DexSplitterMergeRegression.java",
      "new_id": "1bfbaac6c66690545e6f1d7b9b5a9308e85a3130",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/dexsplitter/DexSplitterMergeRegression.java"
    },
    {
      "type": "modify",
      "old_id": "12bc414b2a670419630c391cc83dc187f8bdd9b6",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/ir/optimize/unusedinterfaces/UnusedInterfaceRemovalTest.java",
      "new_id": "9d1165531148f1ca31d738fb9fb1ea3b73a23022",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/ir/optimize/unusedinterfaces/UnusedInterfaceRemovalTest.java"
    },
    {
      "type": "modify",
      "old_id": "6bc0862281800658cac302718e0f587f82657357",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/ir/optimize/unusedinterfaces/UnusedInterfaceWithDefaultMethodTest.java",
      "new_id": "768fbd6341553d0c52939d956d20cd3f4f2802ba",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/ir/optimize/unusedinterfaces/UnusedInterfaceWithDefaultMethodTest.java"
    },
    {
      "type": "modify",
      "old_id": "de5d7f052979293c654d117dd15ca386a3ac19d4",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/shaking/KeepAnnotatedMemberTest.java",
      "new_id": "550356e9ac79175b9756647d129c45fd969835ef",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/shaking/KeepAnnotatedMemberTest.java"
    },
    {
      "type": "modify",
      "old_id": "7f6323a762688780759e229e8193141f6fe97eb5",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/shaking/ParameterTypeTest.java",
      "new_id": "69b0457a840278479b929e01a31e5ac7efcd7919",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/shaking/ParameterTypeTest.java"
    },
    {
      "type": "modify",
      "old_id": "b427736a1a958148f2661f9d1565caf3d33a6d3f",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializationTriggersIndirectInterfaceInitializationTest.java",
      "new_id": "c6e5eff15f1f4e1143813ffc640448f690bdd445",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializationTriggersIndirectInterfaceInitializationTest.java"
    },
    {
      "type": "modify",
      "old_id": "b39fd97f988324b5e50c10e2146c8137abbf3b94",
      "old_mode": 33188,
      "old_path": "src/test/java/com/android/tools/r8/utils/codeinspector/HorizontallyMergedClassesInspector.java",
      "new_id": "0410bc050bc71957aa0d3c98e7dc1bd34fe6b776",
      "new_mode": 33188,
      "new_path": "src/test/java/com/android/tools/r8/utils/codeinspector/HorizontallyMergedClassesInspector.java"
    }
  ]
}