summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2014-07-02 17:54:33 +0100
committerNicolas Geoffray <ngeoffray@google.com>2014-07-02 17:54:33 +0100
commit72e146fe6749023833e14d77d97c3c2d469a6101 (patch)
treefe77285a510f7efd3243d60e37bb3489155e7ef0 /Android.mk
parent02c9d40cb30ce88444b7852114b47b0805517fd8 (diff)
downloadart-72e146fe6749023833e14d77d97c3c2d469a6101.zip
art-72e146fe6749023833e14d77d97c3c2d469a6101.tar.gz
art-72e146fe6749023833e14d77d97c3c2d469a6101.tar.bz2
Fix build-art-target and build-art-host rules.
They did not build the right libjavacore.so for 64bits builds. Change-Id: I8475f73588ffd17933aac4591d19f8803741ef8a
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 3e5e44a..20a0585 100644
--- a/Android.mk
+++ b/Android.mk
@@ -355,10 +355,10 @@ oat-target-sync: oat-target
build-art: build-art-host build-art-target
.PHONY: build-art-host
-build-art-host: $(ART_HOST_EXECUTABLES) $(ART_HOST_GTEST_EXECUTABLES) $(HOST_CORE_IMG_OUT) $(HOST_OUT)/lib/libjavacore.so
+build-art-host: $(ART_HOST_EXECUTABLES) $(ART_HOST_GTEST_EXECUTABLES) $(HOST_CORE_IMG_OUT) $(ART_HOST_OUT_SHARED_LIBRARIES)/libjavacore$(ART_HOST_SHLIB_EXTENSION)
.PHONY: build-art-target
-build-art-target: $(ART_TARGET_EXECUTABLES) $(ART_TARGET_GTEST_EXECUTABLES) $(TARGET_CORE_IMG_OUT) $(TARGET_OUT)/lib/libjavacore.so
+build-art-target: $(ART_TARGET_EXECUTABLES) $(ART_TARGET_GTEST_EXECUTABLES) $(TARGET_CORE_IMG_OUT) $(TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so
########################################################################
# "m art-host" for just building the files needed to run the art script