diff options
| author | Ying Wang <wangying@google.com> | 2014-10-07 23:23:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-07 23:23:15 +0000 |
| commit | 230afab744d13f6abfc4c939343821e9b4b8814c (patch) | |
| tree | 88bdfff9d5452ca14491e5c1f3dfa2d4b9133de5 /core/prebuilt_internal.mk | |
| parent | 179362ea0bef23511e7e03b1aad4f52df2a975c5 (diff) | |
| parent | e4e50f9bb4ae8af11aaddf9825a09ff33241b204 (diff) | |
| download | build-230afab744d13f6abfc4c939343821e9b4b8814c.zip build-230afab744d13f6abfc4c939343821e9b4b8814c.tar.gz build-230afab744d13f6abfc4c939343821e9b4b8814c.tar.bz2 | |
am e4e50f9b: am 8330c4c5: Merge "Apply LOCAL_CXX_STL to also prebuilts."
* commit 'e4e50f9bb4ae8af11aaddf9825a09ff33241b204':
Apply LOCAL_CXX_STL to also prebuilts.
Diffstat (limited to 'core/prebuilt_internal.mk')
| -rw-r--r-- | core/prebuilt_internal.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index 284884c..7e1ea4b 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -96,16 +96,19 @@ endif # prebuilt_module_is_a_library # of the shared libraries are determined. ifdef LOCAL_INSTALLED_MODULE ifdef LOCAL_SHARED_LIBRARIES +my_shared_libraries := $(LOCAL_SHARED_LIBRARIES) +# Extra shared libraries introduced by LOCAL_CXX_STL. +include $(BUILD_SYSTEM)/cxx_stl_setup.mk $(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += \ - $(my_register_name):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(LOCAL_SHARED_LIBRARIES)) + $(my_register_name):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(my_shared_libraries)) # We also need the LOCAL_BUILT_MODULE dependency, # since we use -rpath-link which points to the built module's path. -built_shared_libraries := \ +my_built_shared_libraries := \ $(addprefix $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_INTERMEDIATE_LIBRARIES)/, \ $(addsuffix $($(my_prefix)SHLIB_SUFFIX), \ - $(LOCAL_SHARED_LIBRARIES))) -$(LOCAL_BUILT_MODULE) : $(built_shared_libraries) + $(my_shared_libraries))) +$(LOCAL_BUILT_MODULE) : $(my_built_shared_libraries) endif endif |