commit ef3d5a5e05ab622a6fe044d1431da8140d9b049c
author Stephan Herhut <herhut@google.com> Tue May 23 09:14:46 2017 +0200
committer Stephan Herhut <herhut@google.com> Tue May 23 09:14:46 2017 +0200
tree 3d0de0481f2da2a1c6c65e2348ee2c0016c9d311
parent 1bfac7f282f88520d8f638141b006cfe5dc5cdb3

Move class merger behind a flag.

BUG=
R=ager@google.com

Change-Id: Ib9c7949c3ff6cb522e9a8a10f3810695a4dcafee

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

diff --git a/src/main/java/com/android/tools/r8/R8.java b/src/main/java/com/android/tools/r8/R8.java
index a4cd4db..cd92f2d 100644
--- a/src/main/java/com/android/tools/r8/R8.java
+++ b/src/main/java/com/android/tools/r8/R8.java
@@ -248,7 +248,7 @@
         // No-op until class merger is added.
         graphLense = new MemberRebindingAnalysis(appInfo.withLiveness(), graphLense).run();
         // Class merging requires inlining.
-        if (options.inlineAccessors) {
+        if (!options.skipClassMerging && options.inlineAccessors) {
           timing.begin("ClassMerger");
           graphLense = new SimpleClassMerger(application, appInfo.withLiveness(), graphLense,
               timing).run();

src/main/java/com/android/tools/r8/utils/InternalOptions.java

diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index d3b80e3..1fd72f8 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -33,6 +33,7 @@
   // Skipping optimizations.
   public boolean skipDebugInfoOpt = false;
   public boolean skipDebugLineNumberOpt = false;
+  public boolean skipClassMerging = true;
 
   public boolean lazyClasspathLoading = false;
   public boolean lazyLibraryLoading = false;