commit 519e3d034f0d94eda4aad343a7f367c42d41c2b2
author Brian Carlstrom <bdc@google.com> Wed Jun 25 00:57:36 2014 -0700
committer Brian Carlstrom <bdc@google.com> Wed Jun 25 01:08:17 2014 -0700
tree b90197aaec234c4c90b4b6a851a9a1513bf6fa58
parent 3153895d020038cd89311ed6ee241ce9b9f18a59

Add libjavacore dependency for oat tests

(cherry picked from commit 979942f123a2a9d1949f8be6672ff14101d9f214)

Change-Id: I8f29665259634226ed78fb26b35fb92323310698

test/Android.oat.mk

diff --git a/test/Android.oat.mk b/test/Android.oat.mk
index 4e4f62c..97f8cd5 100644
--- a/test/Android.oat.mk
+++ b/test/Android.oat.mk
@@ -164,11 +164,13 @@
 ART_TEST_HOST_OAT_DEPENDENCIES := \
   $(ART_HOST_EXECUTABLES) \
   $(ART_HOST_LIBRARY_PATH)/libarttest$(ART_HOST_SHLIB_EXTENSION) \
+  $(ART_HOST_LIBRARY_PATH)/libjavacore$(ART_HOST_SHLIB_EXTENSION) \
   $(HOST_CORE_IMG_OUT)
 
 ifneq ($(HOST_PREFER_32_BIT),true)
 ART_TEST_HOST_OAT_DEPENDENCIES += \
   $(2ND_ART_HOST_LIBRARY_PATH)/libarttest$(ART_HOST_SHLIB_EXTENSION) \
+  $(2ND_ART_HOST_LIBRARY_PATH)/libjavacore$(ART_HOST_SHLIB_EXTENSION) \
   $(2ND_HOST_CORE_IMG_OUT)
 endif
 

test/Android.run-test.mk

diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index e76e03b..6863d42 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -109,8 +109,8 @@
 # All tests require the host executables and the core images.
 ART_TEST_HOST_RUN_TEST_DEPENDENCIES := \
   $(ART_HOST_EXECUTABLES) \
-  $(HOST_CORE_IMG_OUT) \
-  $(ART_HOST_LIBRARY_PATH)/libjavacore$(ART_HOST_SHLIB_EXTENSION)
+  $(ART_HOST_LIBRARY_PATH)/libjavacore$(ART_HOST_SHLIB_EXTENSION) \
+  $(HOST_CORE_IMG_OUT)
 
 ifneq ($(HOST_PREFER_32_BIT),true)
 ART_TEST_HOST_RUN_TEST_DEPENDENCIES += \