diff options
| author | Ying Wang <wangying@google.com> | 2015-11-23 16:37:22 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2015-11-23 16:37:22 -0800 |
| commit | 95815341f23eb037bda9d7f160ab9c194808f004 (patch) | |
| tree | d9eaf9f70738628d1af37088c8950d0814f330ae | |
| parent | bafdbfec31bfafcd15f117662732a190619c7588 (diff) | |
| download | apache-harmony-95815341f23eb037bda9d7f160ab9c194808f004.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.
Change-Id: I5d9b75e1c65635f81e0d69abc6b0deca7da37820
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -39,7 +39,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(harmony_test_src_files) LOCAL_JAVA_RESOURCE_DIRS := $(harmony_test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core-libart core-junit +LOCAL_JAVA_LIBRARIES := core-oj core-libart core-junit LOCAL_JAVACFLAGS := $(harmony_test_javac_flags) LOCAL_MODULE := apache-harmony-tests LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt @@ -51,7 +51,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(harmony_test_src_files) LOCAL_JAVA_RESOURCE_DIRS := $(harmony_test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core-libart-hostdex core-junit-hostdex +LOCAL_JAVA_LIBRARIES := core-oj-hostdex core-libart-hostdex core-junit-hostdex LOCAL_JAVACFLAGS := $(harmony_test_javac_flags) LOCAL_MODULE := apache-harmony-tests-hostdex LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt |