)]}' { "commit": "e5075a98c8d6e781fac3da65f1f00c2b6d0ecee1", "tree": "ad10deeb3f2d2cde5abb82d3714656f9f2916f40", "parents": [ "94932b142e611f5c9c9b7546df221a996ed395ab" ], "author": { "name": "Morten Krogh-Jespersen", "email": "mkroghj@google.com", "time": "Sat Feb 06 00:35:39 2021 +0100" }, "committer": { "name": "Morten Krogh-Jespersen", "email": "mkroghj@google.com", "time": "Sat Feb 06 00:35:39 2021 +0100" }, "message": "Reland \"Unify main-dex-classes and main-dex-tracing into one structure\"\n\nThis reverts commit 94932b142e611f5c9c9b7546df221a996ed395ab.\n\nChange-Id: Iaf895e8fbb1bf36e6ee816bdabf8b58f03070432", "tree_diff": [ { "type": "modify", "old_id": "7310ecfccc0115d1c611b2fa6936c6e24696a7db", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/D8.java", "new_id": "7335dbb4d6f965103c3695708a735db50f11008b", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/D8.java" }, { "type": "modify", "old_id": "02307295b83ebd08c0649e5654dde5a436c7d4d1", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/DexSplitterHelper.java", "new_id": "7896d57befd54ec590fc1ae7876ac8eeeab81a74", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/DexSplitterHelper.java" }, { "type": "modify", "old_id": "1e3d7256dd36f272e38469267fcbadb3c434df26", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/GenerateMainDexList.java", "new_id": "b3e100a71d04991235a36f290a2fac18f70748d5", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/GenerateMainDexList.java" }, { "type": "modify", "old_id": "782094c7ad6d5b9bb15324276654bf510ee07bff", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/PrintUses.java", "new_id": "25f4d3ba95e9c25f06b2400d6784338cf79f3cbe", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/PrintUses.java" }, { "type": "modify", "old_id": "a79b3032b23c793c9fa05c48f6e971732ae82f25", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/R8.java", "new_id": "eef9f3d229fb33575bd5393c920d69ff7649de6b", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/R8.java" }, { "type": "modify", "old_id": "4b035d409f2782f5286da8ef5e2bdbf1666b30b6", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/dex/ApplicationReader.java", "new_id": "23db0d92e61319536d440f7d4d8623885ed1249a", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/dex/ApplicationReader.java" }, { "type": "modify", "old_id": "ab72b04c9a463fd1a872b58e56b43574d7409fcb", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/dex/ApplicationWriter.java", "new_id": "da3b04cf7b87a209dc8cd6ff6c0e7cb9676c0797", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/dex/ApplicationWriter.java" }, { "type": "modify", "old_id": "414031e377d1b3c6b8ddc5a033d2e92d372c08c2", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/dex/VirtualFile.java", "new_id": "8f5682751861c1e5fcc517c9680341da165caeb4", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/dex/VirtualFile.java" }, { "type": "modify", "old_id": "302dff441e0473ea37f1befe460287f528832584", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/graph/AppInfo.java", "new_id": "d8785d1ccc1555af3ef4b8c6e031f02a12185335", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/graph/AppInfo.java" }, { "type": "modify", "old_id": "8ff4d1e8970b7e6c8847a6b001c6e5706877ea95", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/graph/AppInfoWithClassHierarchy.java", "new_id": "cd90e167a3d0bc679b2350b22751bc129482a697", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/graph/AppInfoWithClassHierarchy.java" }, { "type": "modify", "old_id": "96df40dd744480b5c42c2ff59e214104213736cc", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/graph/AppView.java", "new_id": "954580bd8eae5be3c7f06c9e23feead43b43e650", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/graph/AppView.java" }, { "type": "modify", "old_id": "50fcfbf7cc9fa4d3447521372f4605b91158fd77", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/graph/GraphLens.java", "new_id": "56d3f523cca7b6619f545788c9519b2c53f173f5", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/graph/GraphLens.java" }, { "type": "modify", "old_id": "47a1625daa5d724253e5f5169f5f6434c53da67f", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/horizontalclassmerging/HorizontalClassMerger.java", "new_id": "d97f12fb11a9a1fad388a59396e72a09bb60d231", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/horizontalclassmerging/HorizontalClassMerger.java" }, { "type": "modify", "old_id": "75aafb45e26dca8455f040fa22440d649251ecf0", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/horizontalclassmerging/HorizontalClassMergerResult.java", "new_id": "820c24afbec8397e292308e04067046c39241d72", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/horizontalclassmerging/HorizontalClassMergerResult.java" }, { "type": "modify", "old_id": "ec64e8a2a39649b283122241b21d1e293483060a", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/horizontalclassmerging/SyntheticArgumentClass.java", "new_id": "60c350a45f17c9da2e97725edcf9334d10648658", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/horizontalclassmerging/SyntheticArgumentClass.java" }, { "type": "modify", "old_id": "9612f98a331f5889101cc6d0bd620136e11f0ca6", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/horizontalclassmerging/policies/DontInlinePolicy.java", "new_id": "f7d121aac889ec247404175b9aa64640e521c14b", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/horizontalclassmerging/policies/DontInlinePolicy.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "52a1d983d7f508735eb95738097485f3baa07224", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/horizontalclassmerging/policies/PreventMergeIntoDifferentMainDexGroups.java" }, { "type": "delete", "old_id": "783ede5f0225da2a17b43233949ee31134664098", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/horizontalclassmerging/policies/PreventMergeIntoMainDex.java", "new_id": "0000000000000000000000000000000000000000", "new_mode": 0, "new_path": "/dev/null" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "850d02eb0b53f7be6fd2e8ff4aa76c8c71069f65", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/horizontalclassmerging/policies/PreventMergeIntoMainDexList.java" }, { "type": "modify", "old_id": "22ee5c5f6477380f3e42d1bfcc5c21ebc5ed0e24", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java", "new_id": "b1e68acefba135114eae7d21c188a7154bb94fb0", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java" }, { "type": "modify", "old_id": "25f232dcb914fe37b0d3786ecd0df8e2d20dbec3", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/ir/desugar/InterfaceMethodRewriter.java", "new_id": "db127f2e149307da751d9397d883e5a206c73180", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/ir/desugar/InterfaceMethodRewriter.java" }, { "type": "modify", "old_id": "79f36ad8dfa7963b40a9b6446ce2647f8dd115f1", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/ir/optimize/DefaultInliningOracle.java", "new_id": "969b5d59957995532cb87e3add76a8197d29a7e7", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/ir/optimize/DefaultInliningOracle.java" }, { "type": "modify", "old_id": "7179327d2bc32fdfde4933184ebb0201add36b29", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/ir/optimize/Devirtualizer.java", "new_id": "f5f4d7085dbc1d85ae746b42da850f0ffd0b5b68", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/ir/optimize/Devirtualizer.java" }, { "type": "modify", "old_id": "9e726b91666c47951f56f8718e8b0a90e326a3b2", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/ir/optimize/Inliner.java", "new_id": "e034587310accbe2159def4c3a4aabf47e684379", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/ir/optimize/Inliner.java" }, { "type": "modify", "old_id": "cc5e7ed4dbe63390be5fdf261169c2ccca170661", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/ir/optimize/ReflectionOptimizer.java", "new_id": "afdf56a11dd89decbc4f007420fb2c4cc6263940", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/ir/optimize/ReflectionOptimizer.java" }, { "type": "modify", "old_id": "5a8ae194d354e2343fa7226939ac7c37603c1a08", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/ir/optimize/enums/UnboxedEnumMemberRelocator.java", "new_id": "48e545cc8aa2dde7fd7ab651fc0fe3e0ac37f36c", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/ir/optimize/enums/UnboxedEnumMemberRelocator.java" }, { "type": "modify", "old_id": "baa118963eab39b0ace62fc6b6f821552bb19b2a", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java", "new_id": "06c03e70f20ecb6c959f4c2ab7c2b4492a6a213e", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java" }, { "type": "modify", "old_id": "d734eb5aac53940b642671aac8742ff0085ac5f7", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/shaking/Enqueuer.java", "new_id": "9c672b1ed0e55e65b901e69ea0e6e65fae44d7cb", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/shaking/Enqueuer.java" }, { "type": "modify", "old_id": "04fb840693fe8364c28ca011f3dc8b50dbead21a", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/shaking/EnqueuerFactory.java", "new_id": "7636fe822df1b7b00b390695e3cd6a6b16268299", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/shaking/EnqueuerFactory.java" }, { "type": "delete", "old_id": "9c1c5290627b89b72717bb9e60bf1c394f205e2d", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/shaking/MainDexClasses.java", "new_id": "0000000000000000000000000000000000000000", "new_mode": 0, "new_path": "/dev/null" }, { "type": "modify", "old_id": "6f7cadedf0a3b5e6a4b80eed4a6ed0b24d50b45e", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/shaking/MainDexDirectReferenceTracer.java", "new_id": "459dea61c1f73d31ec36a6ce1597556e00201edf", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/shaking/MainDexDirectReferenceTracer.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "8d793aaf6f776fd7feac832792811261e73778c4", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/shaking/MainDexInfo.java" }, { "type": "modify", "old_id": "4fa5d3a39536202e6c39160e6aedf3c6bd938fa1", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/shaking/MainDexListBuilder.java", "new_id": "afb39bf230539e62ce8d5d15e08ad8f77cac0f83", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/shaking/MainDexListBuilder.java" }, { "type": "delete", "old_id": "5bf287f080d221abd56abf7f130a6c07d875a3da", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/shaking/MainDexTracingResult.java", "new_id": "0000000000000000000000000000000000000000", "new_mode": 0, "new_path": "/dev/null" }, { "type": "modify", "old_id": "3d51c1a1ddb82b6a8fb2c92222e4be778a80f82b", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/shaking/RootSetUtils.java", "new_id": "8848ece08ad6687fe410ead0be9a31ca840577b9", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/shaking/RootSetUtils.java" }, { "type": "modify", "old_id": "c33cf70de6f0851bf83aab0213ff2cb8e123ac08", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java", "new_id": "4963f21aee81bc7f19283397ba1744327df77684", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java" }, { "type": "modify", "old_id": "f6da35b3045e3811ee80bcaf6375639f139897da", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/synthesis/SynthesizingContext.java", "new_id": "1067e9363e2d05b7501538f79fa77e4177c25894", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/synthesis/SynthesizingContext.java" }, { "type": "modify", "old_id": "2d5ec6041a6d300f10f15617c6a534a43b8e01a9", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/synthesis/SyntheticFinalization.java", "new_id": "741831ef74dd4a7ec1dbc1e6b30b569994f30cf8", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/synthesis/SyntheticFinalization.java" }, { "type": "modify", "old_id": "c40dbeedc0fe1c27d63c37586bbd6bfde46e0481", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/synthesis/SyntheticItems.java", "new_id": "14f9cf8550ef0589a684750ae732ac064e9cb800", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/synthesis/SyntheticItems.java" }, { "type": "modify", "old_id": "286c83d59a5bc809281e22113a56ab68ef2fb080", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/tracereferences/Tracer.java", "new_id": "2bac3333cfafe895c1e0ebc263b63618349f1e82", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/tracereferences/Tracer.java" }, { "type": "modify", "old_id": "a039fb6286e4ed3c7f51212a4b7f5825c5c3ca07", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/utils/LensUtils.java", "new_id": "2c67ac36ea4926383c571320ca039977bb49fca6", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/utils/LensUtils.java" }, { "type": "modify", "old_id": "022f5d9bbd01a55eb86ff9c83bd2618ec9cf263b", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/utils/SetUtils.java", "new_id": "a2781962e6ddd21b38fedfa9c8a609f7ab975bbf", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/utils/SetUtils.java" }, { "type": "modify", "old_id": "fe0aa6c1abc26898bdb4e2ee6387d683c50c717b", "old_mode": 33188, "old_path": "src/test/java/com/android/tools/r8/TestBase.java", "new_id": "3df21b1fddcb5604fcc7cd9e44f2183bac7bd292", "new_mode": 33188, "new_path": "src/test/java/com/android/tools/r8/TestBase.java" }, { "type": "modify", "old_id": "1d7686cb0f19474d8722db6114034854fbda044d", "old_mode": 33188, "old_path": "src/test/java/com/android/tools/r8/ir/IrInjectionTestBase.java", "new_id": "55fcc7451d8ad1e44bdb1b4dcec15913842e6465", "new_mode": 33188, "new_path": "src/test/java/com/android/tools/r8/ir/IrInjectionTestBase.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "5f21fee748e5478ff4d05532463149a3a8356e37", "new_mode": 33188, "new_path": "src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainDexInliningSpuriousRootTest.java" }, { "type": "modify", "old_id": "a76d8cce9ee48c057f09c3f2b9d16c344f64caec", "old_mode": 33188, "old_path": "src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainDexInliningTest.java", "new_id": "98ec4269b17794356a124e83ca6d866ed89aaa42", "new_mode": 33188, "new_path": "src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainDexInliningTest.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "f5971f915a690ff9163284e5b9614906ee9993c0", "new_mode": 33188, "new_path": "src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainDexInliningWithTracingTest.java" }, { "type": "modify", "old_id": "867b1ec16acee5bc546db7fc8cfb2ad9011e1c5c", "old_mode": 33188, "old_path": "src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainHorizontalMergingTest.java", "new_id": "c2c96ec73a6310d6f1ec80c40dff212bb2bf84cd", "new_mode": 33188, "new_path": "src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainHorizontalMergingTest.java" }, { "type": "modify", "old_id": "e3d49f54a87a45286fbfd20965fc3f5539496edb", "old_mode": 33188, "old_path": "src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainVerticalMergingTest.java", "new_id": "ec50d1e7f79d811d3dd2b072021a0c0fa62957d7", "new_mode": 33188, "new_path": "src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainVerticalMergingTest.java" }, { "type": "modify", "old_id": "82f5e7d2131ce59024cbcd1ffd24e91e2ad353da", "old_mode": 33188, "old_path": "src/test/java/com/android/tools/r8/maindexlist/MainDexListInliningTest.java", "new_id": "09df9d4a0bbd98ee80bb3d9d5ec78e5921788188", "new_mode": 33188, "new_path": "src/test/java/com/android/tools/r8/maindexlist/MainDexListInliningTest.java" } ] }