From 672079a75aaaf30dab3729b865e79185f87d88f2 Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Tue, 3 Aug 2010 17:25:09 -0700 Subject: Fix Framework core tests import of android-common. android.database.CursorWindowTest#testWriteCursorToWindow (and possibly other tests) were was failing because it couldn't locate a android-common class. Fix is to include android-common as a static library, as opposed to a runtime library. Change-Id: Iae50cf409e76a85ee79e4af71e9b903d18630078 --- core/tests/coretests/Android.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'core') diff --git a/core/tests/coretests/Android.mk b/core/tests/coretests/Android.mk index 01faaad..693ef18 100644 --- a/core/tests/coretests/Android.mk +++ b/core/tests/coretests/Android.mk @@ -11,11 +11,9 @@ LOCAL_SRC_FILES := \ $(call all-java-files-under, DisabledTestApp/src) \ $(call all-java-files-under, EnabledTestApp/src) -LOCAL_STATIC_JAVA_LIBRARIES += android-common - LOCAL_DX_FLAGS := --core-library -LOCAL_STATIC_JAVA_LIBRARIES := core-tests-supportlib -LOCAL_JAVA_LIBRARIES := android.test.runner android-common +LOCAL_STATIC_JAVA_LIBRARIES := core-tests-supportlib android-common +LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_PACKAGE_NAME := FrameworksCoreTests LOCAL_CERTIFICATE := platform -- cgit v1.1