| commit | b7a53ad5a587926cb880d9bb6f3d51657596474c | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Thu Jun 19 01:59:11 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jun 17 21:16:51 2014 +0000 |
| tree | 81954eb4551fd6e6c71c60ca55d7a24de7e33b60 | |
| parent | ad3f12ec91a6b419bbf4b24b619ed39bf04589ea [diff] | |
| parent | ab0c7753056c402b49ba962c0140a7a086d8ab5a [diff] |
Merge "Switch from core to core-libart"
diff --git a/Android.mk b/Android.mk index 0567baf..8ad024e 100644 --- a/Android.mk +++ b/Android.mk
@@ -18,7 +18,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_RESOURCE_DIRS := res LOCAL_MODULE := nist-pkix-tests -LOCAL_JAVA_LIBRARIES := core core-junit +LOCAL_JAVA_LIBRARIES := core-libart core-junit LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_JAVA_LIBRARY)