commit 2411d418ef96c142c0c27285b2ac71e84804687d
author Søren Gjesse <sgjesse@google.com> Thu May 17 08:41:14 2018 +0200
committer Søren Gjesse <sgjesse@google.com> Thu May 17 08:41:14 2018 +0200
tree 3b688e4449d43d12c1d292d4e7806ba6b21da9c9
parent 3d1da5df571917d9c78c5ca819eb5a3bd64f4a34

Fix use of -whyareyoukeeping with main dex rules

Before this putting -whyareyoukeeping in the main dex rules file would
throw a NullPointerException.

Change-Id: Ic78b759f40247bb400c038b62b4135fca951ba6a

src/main/java/com/android/tools/r8/GenerateMainDexList.java

diff --git a/src/main/java/com/android/tools/r8/GenerateMainDexList.java b/src/main/java/com/android/tools/r8/GenerateMainDexList.java
index 3db9699..26097c1 100644
--- a/src/main/java/com/android/tools/r8/GenerateMainDexList.java
+++ b/src/main/java/com/android/tools/r8/GenerateMainDexList.java
@@ -59,7 +59,7 @@
     // Print -whyareyoukeeping results if any.
     if (mainDexRootSet.reasonAsked.size() > 0) {
       // Print reasons on the application after pruning, so that we reflect the actual result.
-      TreePruner pruner = new TreePruner(application, appInfo.withLiveness(), options);
+      TreePruner pruner = new TreePruner(application, mainDexAppInfo.withLiveness(), options);
       application = pruner.run();
       ReasonPrinter reasonPrinter = enqueuer.getReasonPrinter(mainDexRootSet.reasonAsked);
       reasonPrinter.run(application);