From 72e146fe6749023833e14d77d97c3c2d469a6101 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Wed, 2 Jul 2014 17:54:33 +0100 Subject: [PATCH] Fix build-art-target and build-art-host rules. They did not build the right libjavacore.so for 64bits builds. Change-Id: I8475f73588ffd17933aac4591d19f8803741ef8a --- Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index 3e5e44a6c..20a0585b1 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 -- 2.11.0