commit 294311c7ae537eb1756bc8632a4f8cf7637f2e43
author Delphine Martin <delphinemartin@google.com> Fri Sep 23 13:02:44 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 23 13:02:44 2016 +0000
tree a4ab3bf72cb15afdfa3ea5f6f5bcf3942259ea12
parent d40b24f0f08badd944634dd937e4441945a56c8d
parent 1ac46a2b6a04207b7cf26d5685f99b31dc27a88c

Merge "Remove singleton for multiDexLegacy marker" into ub-jack

jack/src/com/android/jack/backend/dex/MultiDexLegacyTracerBrush.java

diff --git a/jack/src/com/android/jack/backend/dex/MultiDexLegacyTracerBrush.java b/jack/src/com/android/jack/backend/dex/MultiDexLegacyTracerBrush.java
index 56d0079..54a0f39 100644
--- a/jack/src/com/android/jack/backend/dex/MultiDexLegacyTracerBrush.java
+++ b/jack/src/com/android/jack/backend/dex/MultiDexLegacyTracerBrush.java
@@ -45,11 +45,6 @@
   @ValidOn({JDefinedClassOrInterface.class, JMethod.class, JField.class})
   @Description("Indicates that this node was identified during the main dex legacy tracing")
   public static class TracerMarker extends BaseTracerMarker {
-    @Nonnull
-    public static final TracerMarker INSTANCE = new TracerMarker();
-
-    private TracerMarker() {
-    }
   }
 
   /**
@@ -80,7 +75,7 @@
   @Nonnull
   @Override
   protected TracerMarker createMarkerFor(@Nonnull JNode node) {
-    return TracerMarker.INSTANCE;
+    return new TracerMarker();
   }
 
 }