diff options
| author | Ying Wang <wangying@google.com> | 2011-09-20 20:02:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-20 20:02:17 -0700 |
| commit | 04c485843f9fce0f66d18cb96e1051b7382b1f38 (patch) | |
| tree | 0d6ab73061909f5e69d6416e7c939128f3c7c6dd /core | |
| parent | 514c487dcb0f0a3ef800305bbf75c0773f1e4966 (diff) | |
| parent | c36b450ab10df53ce116ee7277e431e7b64ea218 (diff) | |
| download | build-04c485843f9fce0f66d18cb96e1051b7382b1f38.zip build-04c485843f9fce0f66d18cb96e1051b7382b1f38.tar.gz build-04c485843f9fce0f66d18cb96e1051b7382b1f38.tar.bz2 | |
Merge "Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries." into ics-factoryrom
Diffstat (limited to 'core')
| -rw-r--r-- | core/prebuilt.mk | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/core/prebuilt.mk b/core/prebuilt.mk index bd4d91f..935bce1 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)) |