summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2015-12-08 06:17:03 -0800
committer android-build-merger <android-build-merger@google.com> 2015-12-08 06:17:03 -0800
commitd441dca72bfdf5cf4eb79fdd77b2fab0e4e598ff (patch)
tree4abac93348336b035e1f161c0771faf73a18eab2
parent4135a54df9fc196feb76ce7364425b19647866e4 (diff)
parent0ec9daecc6129529fc6f2d66c29876eca88c492f (diff)
Merge "Follow-up to Switch to the latest version of Caliper" am: 80d5bef6f9
am: 0ec9daecc6 * commit '0ec9daecc6129529fc6f2d66c29876eca88c492f': Follow-up to Switch to the latest version of Caliper
-rw-r--r--core/tests/benchmarks/Android.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/tests/benchmarks/Android.mk b/core/tests/benchmarks/Android.mk
index b7b295aeca99..26a44a6a5fd9 100644
--- a/core/tests/benchmarks/Android.mk
+++ b/core/tests/benchmarks/Android.mk
@@ -23,7 +23,6 @@ LOCAL_MODULE := frameworks-base-core-benchmarks
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_SRC_FILES := $(call all-java-files-under, src/)
-LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_JAVA_LIBRARIES := \
caliper-api-target \