diff options
| author | Brett Chabot <brettchabot@android.com> | 2010-08-03 17:25:09 -0700 |
|---|---|---|
| committer | Brett Chabot <brettchabot@android.com> | 2010-08-03 17:28:19 -0700 |
| commit | 672079a75aaaf30dab3729b865e79185f87d88f2 (patch) | |
| tree | 23054cb69134d52e0adb35458f91a080ef901011 /core | |
| parent | 6c8687cf1e52abede549908afe8d8820d24eaecd (diff) | |
| download | frameworks_base-672079a75aaaf30dab3729b865e79185f87d88f2.zip frameworks_base-672079a75aaaf30dab3729b865e79185f87d88f2.tar.gz frameworks_base-672079a75aaaf30dab3729b865e79185f87d88f2.tar.bz2 | |
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
Diffstat (limited to 'core')
| -rw-r--r-- | core/tests/coretests/Android.mk | 6 |
1 files changed, 2 insertions, 4 deletions
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 |