Merge "Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries." into ics-factoryrom (04c48584) · Commits · e / os / android_build

core/prebuilt.mk

+11 −0

Original line number	Diff line number	Diff line
		@@ -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))