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
This commit is contained in:
Ying Wang 2011-09-15 12:00:52 -07:00
parent 704c0c9fca
commit c36b450ab1

View file

@ -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))