commit 60cb26246136824c177bbc73a162a2a8fe08cc1f
author Morten Krogh-Jespersen <mkroghj@google.com> Fri Sep 25 21:52:26 2020 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Sep 28 06:12:50 2020 +0000
tree 20694ff5570c2b8fdefa99925c0113d14ee14c87
parent 5fcf5fd1c4fc7288608e9b4a5f575747f5b15000

Remove keep-applymapping.txt

Bug: 133091438
Bug: 139344231
Change-Id: I80ba26b35d5c486e6395a9f478540631850b50d5

build.gradle

diff --git a/build.gradle b/build.gradle
index b7c7830..99676ef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1006,9 +1006,7 @@
 task R8Lib {
     dependsOn r8LibCreateTask(
             "Main",
-            ["src/main/keep.txt",
-             "src/main/keep-applymapping.txt",
-             generateR8LibKeepRules.outputs.files[0]],
+            ["src/main/keep.txt", generateR8LibKeepRules.outputs.files[0]],
             r8NoManifestWithRelocatedDeps,
             r8LibPath,
     ).dependsOn(generateR8LibKeepRules)
@@ -1019,7 +1017,7 @@
 task R8LibNoDeps {
     dependsOn r8LibCreateTask(
             "NoDeps",
-            ["src/main/keep.txt", "src/main/keep-applymapping.txt"],
+            ["src/main/keep.txt"],
             r8NoManifestWithoutDeps,
             r8LibExludeDepsPath,
             "--release",

src/main/keep-applymapping.txt

diff --git a/src/main/keep-applymapping.txt b/src/main/keep-applymapping.txt
deleted file mode 100644
index c404d21..0000000
--- a/src/main/keep-applymapping.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2019, the R8 project authors. Please see the AUTHORS file
-# for details. All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-# TODO(b/133091438,b/139344231) These rules are needed for applymapping but should be able to be
-# removed when we have --classpath.
--keepclassmembers,allowobfuscation class com.android.tools.r8.ir.optimize.MemberPoolCollection {
-  *** buildForHierarchy(...);
-}
--keepclassmembers,allowobfuscation class com.android.tools.r8.jar.CfApplicationWriter {
-  void write(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService);
-  void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService);
-}
--keep class com.android.tools.r8.BaseCommand {
-  com.android.tools.r8.utils.AndroidApp getInputApp();
-}
-
-# Obfuscating the members below can result in naming-conflicts so just keep them.
--keep class com.android.tools.r8.joptsimple.OptionDescriptor {
-  java.lang.String argumentDescription();
-}