diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-08-04 15:44:39 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2010-08-04 23:47:38 -0700 |
| commit | 3c7c351a6217ac48b741740167c201a679a0ca65 (patch) | |
| tree | f539d70e0a46249f01dd6fb45563f1ebc4bed706 /test-runner | |
| parent | cde66df44240cfe5a7bec12ac52464c3bf26c14f (diff) | |
| download | frameworks_base-3c7c351a6217ac48b741740167c201a679a0ca65.zip frameworks_base-3c7c351a6217ac48b741740167c201a679a0ca65.tar.gz frameworks_base-3c7c351a6217ac48b741740167c201a679a0ca65.tar.bz2 | |
Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit f77cf7f0
git cherry-pick --no-commit c8f503b5285e30c1a881d0ba860ba9021f57d113
git cherry-pick --no-commit 570bb561
git cherry-pick --no-commit e2417541
git cherry-pick --no-commit e4d81f25bd4dc1a5c909b56ab56a56406290da30
git cherry-pick --no-commit 5e8a587d
Change-Id: I101a385d43f3e0f4ce5352217f92ef67a3908c88
Diffstat (limited to 'test-runner')
| -rw-r--r-- | test-runner/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test-runner/Android.mk b/test-runner/Android.mk index 962e96c..6d81b71 100644 --- a/test-runner/Android.mk +++ b/test-runner/Android.mk @@ -20,7 +20,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_JAVA_LIBRARIES := core framework +LOCAL_JAVA_LIBRARIES := core core-junit framework LOCAL_MODULE:= android.test.runner |