commit ea13f8291a92b6f47f50011da1d5e8c107984bc3
author Paul Duffin <paulduffin@google.com> Mon Nov 30 11:09:55 2015 +0000
committer Paul Duffin <paulduffin@google.com> Mon Dec 07 12:30:04 2015 +0000
tree d90aa0eb1296ca62a42eb04547a6544b976277fa
parent 0363e013d538d45081314c188cc4d4bf96dca92e

Switch to latest version of Caliper

Convert the benchmarks to the latest version of Caliper.

Bug: 24848946
Change-Id: Iac04b30dac61ccb397a6685890da64bae4d3b318

benchmarks/Android.mk

diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk
index 9e650918..3a82fc6 100644
--- a/benchmarks/Android.mk
+++ b/benchmarks/Android.mk
@@ -21,19 +21,18 @@
 include $(CLEAR_VARS)
 LOCAL_MODULE := benchmarks
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_STATIC_JAVA_LIBRARIES := caliper-prebuilt mockwebserver core-tests-support
+LOCAL_STATIC_JAVA_LIBRARIES := mockwebserver core-tests-support
 LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core-libart conscrypt core-junit bouncycastle framework
+LOCAL_JAVA_LIBRARIES := \
+  caliper-api-target \
+  core-libart \
+  conscrypt \
+  core-junit \
+  bouncycastle \
+  framework
 LOCAL_MODULE_TAGS := tests
 LOCAL_MODULE_PATH := $(PRODUCT_OUT)/data/caliperperf
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 include $(BUILD_JAVA_LIBRARY)
 
-##################################################
-# Prebuilt Java libraries
-include $(CLEAR_VARS)
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := caliper-prebuilt:libs/caliper.jar
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-include $(BUILD_MULTI_PREBUILT)
-
 endif