commit 89bc34d2fbf0837df0fa669f2bb7d866a4497640
author Ian Zerny <zerny@google.com> Wed May 22 10:21:09 2019 +0200
committer Ian Zerny <zerny@google.com> Wed May 22 11:04:45 2019 +0000
tree db4f7774d6cb5a4b825544ce799e1fa8a4154ac8
parent e820d9900f609a41b7791fd9e315e3ee86bc9d1f

Ensure compatdx and compatproguard proper extensions of R8.

Bug: 132911943
Change-Id: I90c3633b93b8a6214004d67bd520f1a97f5e47b6

src/main/keep-compatdx.txt

diff --git a/src/main/keep-compatdx.txt b/src/main/keep-compatdx.txt
index 75a8012..e4c5688 100644
--- a/src/main/keep-compatdx.txt
+++ b/src/main/keep-compatdx.txt
@@ -2,5 +2,9 @@
 # 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.
 
--keep public class com.android.tools.r8.compatdx.CompatDx { public static void main(java.lang.String[]); }
--keepattributes LineNumberTable
+# This entry must remain a proper extension of R8 to ensure all required parts are kept.
+-include keep.txt
+
+-keep public class com.android.tools.r8.compatdx.CompatDx {
+  public static void main(java.lang.String[]);
+}

src/main/keep-compatproguard.txt

diff --git a/src/main/keep-compatproguard.txt b/src/main/keep-compatproguard.txt
index e29d13e..80ca009 100644
--- a/src/main/keep-compatproguard.txt
+++ b/src/main/keep-compatproguard.txt
@@ -2,5 +2,9 @@
 # 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.
 
--keep public class com.android.tools.r8.compatproguard.CompatProguard { public static void main(java.lang.String[]); }
--keepattributes LineNumberTable
+# This entry must remain a proper extension of R8 to ensure all required parts are kept.
+-include keep.txt
+
+-keep public class com.android.tools.r8.compatproguard.CompatProguard {
+  public static void main(java.lang.String[]);
+}