diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-06-19 02:16:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-19 02:16:34 +0000 |
| commit | 7f047f02ad713305acf1de5db7d07792318d69c2 (patch) | |
| tree | f3e32b95a7b27a5c5b9c4090515a7e9ed0964379 /test-runner | |
| parent | 5376c00db3b34f59c679911a950574ce87c822f6 (diff) | |
| parent | 80f1fe5f7cc80b6f1da142c782ccbbad45d878a8 (diff) | |
| download | frameworks_base-7f047f02ad713305acf1de5db7d07792318d69c2.zip frameworks_base-7f047f02ad713305acf1de5db7d07792318d69c2.tar.gz frameworks_base-7f047f02ad713305acf1de5db7d07792318d69c2.tar.bz2 | |
am 80f1fe5f: am f8077cf2: am 8e21e215: Merge "Switch from core to core-libart"
* commit '80f1fe5f7cc80b6f1da142c782ccbbad45d878a8':
Switch from core to core-libart
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 0d9e4f1..b12795c 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 core-junit framework +LOCAL_JAVA_LIBRARIES := core-libart core-junit framework LOCAL_STATIC_JAVA_LIBRARIES := junit-runner LOCAL_MODULE:= android.test.runner |