summaryrefslogtreecommitdiff
path: root/core/tests/benchmarks
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2015-12-08 14:22:55 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-12-08 14:22:55 +0000
commitcde2287208d9aea41811b5844ab3142d3411bccd (patch)
treecad6ceffd7357e26d5c05dd55df259e56b286fac /core/tests/benchmarks
parent5160b7a9adb9c77222c0352c13a97983908655ff (diff)
parente94e7dd181fb1857bf7aa3b807b64d9bb231edc6 (diff)
Merge "Remove framework from LOCAL_JAVA_LIBRARIES" am: e252149ab9 am: ec9081a004
am: e94e7dd181 * commit 'e94e7dd181fb1857bf7aa3b807b64d9bb231edc6': Remove framework from LOCAL_JAVA_LIBRARIES
Diffstat (limited to 'core/tests/benchmarks')
-rw-r--r--core/tests/benchmarks/Android.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/tests/benchmarks/Android.mk b/core/tests/benchmarks/Android.mk
index 26a44a6a5fd9..25181b5f930a 100644
--- a/core/tests/benchmarks/Android.mk
+++ b/core/tests/benchmarks/Android.mk
@@ -25,7 +25,6 @@ LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_SRC_FILES := $(call all-java-files-under, src/)
LOCAL_JAVA_LIBRARIES := \
- caliper-api-target \
- framework
+ caliper-api-target
include $(BUILD_JAVA_LIBRARY)