diff options
| author | Ying Wang <wangying@google.com> | 2015-11-23 15:22:44 -0800 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-12-22 13:38:54 +0000 |
| commit | c62549a52b88c498e1882598f1b09cd465ce9eac (patch) | |
| tree | c59a8fad5d4beacc50a86b7f155943ffde62b611 | |
| parent | f658bf17d3a1170989d802aa52320dd5373d9749 (diff) | |
| download | nist-pkits-c62549a52b88c498e1882598f1b09cd465ce9eac.tar.gz | |
Use core-oj alongside core-libart wherever required.
With some core classes moved to separate core-oj jar
we need to use the new jar.
(cherry picked from commit 96a54c42b4cee793a0d1174082f1d94c1342d1b3)
Change-Id: I693babc2a4d8ad16005f6e7b4a65866996be6300
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -18,7 +18,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_RESOURCE_DIRS := res LOCAL_MODULE := nist-pkix-tests -LOCAL_JAVA_LIBRARIES := core-libart core-junit +LOCAL_JAVA_LIBRARIES := core-oj core-libart core-junit LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_JAVA_LIBRARY) |