summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2015-12-08 06:18:30 -0800
committer android-build-merger <android-build-merger@google.com> 2015-12-08 06:18:30 -0800
commite94e7dd181fb1857bf7aa3b807b64d9bb231edc6 (patch)
tree5c3abfbc7431f32288251dff42f909d12392f077
parentd441dca72bfdf5cf4eb79fdd77b2fab0e4e598ff (diff)
parentec9081a004db058bb5ada5173d65a565e2005c6d (diff)
Merge "Remove framework from LOCAL_JAVA_LIBRARIES" am: e252149ab9
am: ec9081a004 * commit 'ec9081a004db058bb5ada5173d65a565e2005c6d': Remove framework from LOCAL_JAVA_LIBRARIES
-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)