diff options
author | Brian Carlstrom <bdc@google.com> | 2014-06-19 02:08:10 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-19 02:08:10 +0000 |
commit | 80f1fe5f7cc80b6f1da142c782ccbbad45d878a8 (patch) | |
tree | 995aab8fd3567fb9b83b1309d23f78be918f1912 /test-runner | |
parent | 3aa4de11b05599d75af92a15820731144941c38f (diff) | |
parent | f8077cf2d7ee55dbf02ec0c65a05db7e5c2fabfc (diff) | |
download | frameworks_base-80f1fe5f7cc80b6f1da142c782ccbbad45d878a8.zip frameworks_base-80f1fe5f7cc80b6f1da142c782ccbbad45d878a8.tar.gz frameworks_base-80f1fe5f7cc80b6f1da142c782ccbbad45d878a8.tar.bz2 |
am f8077cf2: am 8e21e215: Merge "Switch from core to core-libart"
* commit 'f8077cf2d7ee55dbf02ec0c65a05db7e5c2fabfc':
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 |