diff options
| author | Andreas Gampe <agampe@google.com> | 2014-05-21 11:02:08 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-05-21 11:02:48 -0700 |
| commit | fb040d068cd0a6e91cea3cba279a5f4e3f67825d (patch) | |
| tree | 229ad654824c379659eeb9334baa29554cdbce59 /Android.mk | |
| parent | 299d2a2b200a94daa49c4727fd679f4461c083c7 (diff) | |
| download | art-fb040d068cd0a6e91cea3cba279a5f4e3f67825d.zip art-fb040d068cd0a6e91cea3cba279a5f4e3f67825d.tar.gz art-fb040d068cd0a6e91cea3cba279a5f4e3f67825d.tar.bz2 | |
ART: Fix libjavacore dependency
Add a dependency for libjavacore for the secondary architecture.
Change-Id: I30f07c200e1cbb7d50b026fa6b21d09ab9aadd66
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -97,6 +97,9 @@ include $(art_build_path)/Android.oat.mk 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 |