summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndy McFadden <fadden@android.com>2011-07-13 16:25:24 -0700
committerAndy McFadden <fadden@android.com>2011-07-13 16:25:24 -0700
commit27998dda44c02537ee6ae0b88c260036ec99160f (patch)
tree0d1483b28523764de2a28932d76882030d9bee3d /tests
parentfd783a5324a764060658afe77ad93a5ecc455a73 (diff)
downloadandroid_packages_apps_Calendar-27998dda44c02537ee6ae0b88c260036ec99160f.tar.gz
android_packages_apps_Calendar-27998dda44c02537ee6ae0b88c260036ec99160f.tar.bz2
android_packages_apps_Calendar-27998dda44c02537ee6ae0b88c260036ec99160f.zip
Remove calendar-common from test makefile
The test jar doesn't need it, and Dalvik gets confused when there's two copies of the same classes from different places. Change-Id: I625460a13cd4e9652cdd36aff2ea97079e3a8a26
Diffstat (limited to 'tests')
-rw-r--r--tests/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Android.mk b/tests/Android.mk
index 08252b99..d00b692a 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -16,7 +16,7 @@ LOCAL_PACKAGE_NAME := CalendarTests
LOCAL_INSTRUMENTATION_FOR := Calendar
# unbundled
-LOCAL_STATIC_JAVA_LIBRARIES := android-common calendar-common
+LOCAL_STATIC_JAVA_LIBRARIES := android-common
LOCAL_SDK_VERSION := current
include $(BUILD_PACKAGE)