commit cd891206661e87bb59174351f09be112f1d19624
author Christoffer Quist Adamsen <christofferqa@google.com> Wed May 22 15:23:43 2019 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed May 22 15:23:43 2019 +0200
tree 50ca8e00b8c6933d6ebfe0635820ee3dc8042c03
parent 6d6e04e7b22749184e0b44699cb709f026d00f20

Only run ServiceLoaderRewriter in R8

Change-Id: I808256ab4748ebde4805b92f8c7b2e61b773fa51

src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java b/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
index 4328b31..3926640 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
@@ -918,7 +918,7 @@
     // we will return with finalizeEmptyThrowingCode() above.
     assert code.verifyTypes(appView);
 
-    if (options.enableServiceLoaderRewriting) {
+    if (appView.enableWholeProgramOptimizations() && options.enableServiceLoaderRewriting) {
       assert appView.appInfo().hasLiveness();
       ServiceLoaderRewriter.rewrite(code, appView.withLiveness());
     }