Switch to use the latest version of caliperandroid-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2

Change-Id: I6082cbdc9a10a897963fb18072b7ec044daf76db

2 files changed, 8 insertions, 2 deletions

diff --git a/Android.mk b/Android.mk
index 75ef32c..2c8f79f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -27,3 +27,10 @@ LOCAL_STATIC_JAVA_LIBRARIES := messageformat junit-targetdex
 LOCAL_SRC_FILES := $(call all-java-files-under, javatests/)
 LOCAL_SDK_VERSION := 9
 include $(BUILD_STATIC_JAVA_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := messageformat-benchmarks
+LOCAL_STATIC_JAVA_LIBRARIES := messageformat caliper-api-target
+LOCAL_SRC_FILES := $(call all-java-files-under, benchmarks/)
+LOCAL_SDK_VERSION := 9
+include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/benchmarks/com/android/messageformat/MessageFormatBenchmark.java b/benchmarks/com/android/messageformat/MessageFormatBenchmark.java
index 79847cb..5e4ecd5 100644
--- a/benchmarks/com/android/messageformat/MessageFormatBenchmark.java
+++ b/benchmarks/com/android/messageformat/MessageFormatBenchmark.java
@@ -16,10 +16,9 @@
 
 package com.android.messageformat;
 
-import com.google.caliper.SimpleBenchmark;
 import java.util.Locale;
 
-public class MessageFormatBenchmark extends SimpleBenchmark {
+public class MessageFormatBenchmark {
     public void timePlurals(int nreps) throws Exception {
         final Locale sr = new Locale("sr");
         for (int i = 0; i < nreps; ++i) {