X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=vndk%2FAndroid.mk;h=4ef78ba09c99ea1d6161e6a35a11cc921f416bc5;hb=a17885c51d8d15cff19b37d0811af2cc494686bc;hp=a2cc0b4e4c86c0ddf41b23e50a8fe26a36aa241d;hpb=acd5c609a2f85c398818124435a4b889ad2fd6ec;p=android-x86%2Fdevice-generic-common.git

diff --git a/vndk/Android.mk b/vndk/Android.mk
index a2cc0b4..4ef78ba 100644
--- a/vndk/Android.mk
+++ b/vndk/Android.mk
@@ -8,7 +8,7 @@ define define-vndk-sp-lib
 include $$(CLEAR_VARS)
 LOCAL_MODULE := $1.vndk-sp-gen
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_PREBUILT_MODULE_FILE := $$(TARGET_OUT_INTERMEDIATE_LIBRARIES)/$1.so
+LOCAL_PREBUILT_MODULE_FILE := $$(call intermediates-dir-for,SHARED_LIBRARIES,$1,,,,)/$1.so
 LOCAL_STRIP_MODULE := false
 LOCAL_MULTILIB := first
 LOCAL_MODULE_TAGS := optional
@@ -22,7 +22,7 @@ ifneq ($$(TARGET_TRANSLATE_2ND_ARCH),true)
 include $$(CLEAR_VARS)
 LOCAL_MODULE := $1.vndk-sp-gen
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_PREBUILT_MODULE_FILE := $$($$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES)/$1.so
+LOCAL_PREBUILT_MODULE_FILE := $$(call intermediates-dir-for,SHARED_LIBRARIES,$1,,,$$(TARGET_2ND_ARCH_VAR_PREFIX),)/$1.so
 LOCAL_STRIP_MODULE := false
 LOCAL_MULTILIB := 32
 LOCAL_MODULE_TAGS := optional