commit 9e63db233cdbf5de7b4157cde244b37a56f8854c
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Thu Nov 19 11:53:57 2015 +0000
committer The Android Automerger <android-build@google.com> Mon Nov 23 11:29:57 2015 -0800
tree 0bdac7754dbbb5b287d3aa4d71fe686a228f0c51
parent 24d21d4304264c45229b08492a2ae17942c24379

Add core-oj to the list of dependencies

Change-Id: I99a3f78254051244cfffc9f4e40b6d2a03306403

Android.mk

diff --git a/Android.mk b/Android.mk
index 9573ef9..781b2b2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -39,7 +39,7 @@
 # TODO: lose the suffix here and rename "junit" to "junit-hostdex"
 LOCAL_MODULE := junit-targetdex
 LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core-libart
+LOCAL_JAVA_LIBRARIES := core-oj core-libart
 LOCAL_MODULE_TAGS := tests
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/junit
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk
@@ -66,7 +66,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src/junit/extensions)
 LOCAL_SRC_FILES += $(core-junit-files)
 LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core-libart
+LOCAL_JAVA_LIBRARIES := core-oj core-libart
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := core-junit
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk
@@ -96,7 +96,7 @@
 LOCAL_SRC_FILES := $(junit-runner-files)
 LOCAL_MODULE := junit-runner
 LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core-libart core-junit
+LOCAL_JAVA_LIBRARIES := core-oj core-libart core-junit
 LOCAL_MODULE_TAGS := optional
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk
 include $(BUILD_STATIC_JAVA_LIBRARY)
@@ -110,7 +110,7 @@
 LOCAL_MODULE := junit-runner-hostdex
 LOCAL_MODULE_TAGS := optional
 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_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk
 include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)