From c36b450ab10df53ce116ee7277e431e7b64ea218 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Thu, 15 Sep 2011 12:00:52 -0700 Subject: [PATCH] Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries. So that prebuilt shared libraries can be referenced with the module name in other module's Android.mk. Change-Id: I4c4b471696642694b805b71dd7605b91724ad924 --- core/prebuilt.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/core/prebuilt.mk b/core/prebuilt.mk index bd4d91f714..935bce1f2d 100644 --- a/core/prebuilt.mk +++ b/core/prebuilt.mk @@ -16,6 +16,17 @@ ifneq ($(LOCAL_PREBUILT_JAVA_LIBRARIES),) $(error dont use LOCAL_PREBUILT_JAVA_LIBRARIES anymore LOCAL_PATH=$(LOCAL_PATH)) endif +ifdef LOCAL_IS_HOST_MODULE + my_prefix:=HOST_ +else + my_prefix:=TARGET_ +endif +ifeq (SHARED_LIBRARIES,$(LOCAL_MODULE_CLASS)) + # Put the built targets of all shared libraries in a common directory + # to simplify the link line. + OVERRIDE_BUILT_MODULE_PATH := $($(my_prefix)OUT_INTERMEDIATE_LIBRARIES) +endif + ifeq ($(LOCAL_STRIP_MODULE),true) ifdef LOCAL_IS_HOST_MODULE $(error Cannot strip host module LOCAL_PATH=$(LOCAL_PATH))