commit fb040d068cd0a6e91cea3cba279a5f4e3f67825d
author Andreas Gampe <agampe@google.com> Wed May 21 11:02:08 2014 -0700
committer Andreas Gampe <agampe@google.com> Wed May 21 11:02:48 2014 -0700
tree 229ad654824c379659eeb9334baa29554cdbce59
parent 299d2a2b200a94daa49c4727fd679f4461c083c7

ART: Fix libjavacore dependency

Add a dependency for libjavacore for the secondary architecture.

Change-Id: I30f07c200e1cbb7d50b026fa6b21d09ab9aadd66

Android.mk

diff --git a/Android.mk b/Android.mk
index 0eaca7f..3324458 100644
--- a/Android.mk
+++ b/Android.mk
@@ -97,6 +97,9 @@
 ART_HOST_DEPENDENCIES := $(ART_HOST_EXECUTABLES) $(HOST_OUT_JAVA_LIBRARIES)/core-libart-hostdex.jar
 ART_HOST_DEPENDENCIES += $(HOST_OUT_SHARED_LIBRARIES)/libjavacore$(ART_HOST_SHLIB_EXTENSION)
 ART_TARGET_DEPENDENCIES := $(ART_TARGET_EXECUTABLES) $(TARGET_OUT_JAVA_LIBRARIES)/core-libart.jar $(TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so
+ifdef TARGET_2ND_ARCH
+ART_TARGET_DEPENDENCIES += $(2ND_TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so
+endif
 
 ########################################################################
 # test targets