diff options
| author | Ying Wang <wangying@google.com> | 2014-10-07 13:03:29 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-10-07 13:03:29 -0700 |
| commit | 7c877395b17ebb936b39769e8107e594bb8b6194 (patch) | |
| tree | 3286ed2d10a3b284cbeadc521ab59c2e7125e5ae /core/prebuilt_internal.mk | |
| parent | 1bd57479378f001fc2c9050c59895c46e721dc02 (diff) | |
| download | build-7c877395b17ebb936b39769e8107e594bb8b6194.zip build-7c877395b17ebb936b39769e8107e594bb8b6194.tar.gz build-7c877395b17ebb936b39769e8107e594bb8b6194.tar.bz2 | |
Apply LOCAL_CXX_STL to also prebuilts.
Because LOCAL_CXX_STL modifies a module's required shared libaries,
we need this for also prebuilt shared libraries and executables.
Change-Id: I418c26143999a613c40aadf990f131b123e0ac3d
Diffstat (limited to 'core/prebuilt_internal.mk')
| -rw-r--r-- | core/prebuilt_internal.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index 551cf2d..69f2986 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -101,20 +101,23 @@ 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 -# We need to enclose the above export_includes and built_shared_libraries in +# We need to enclose the above export_includes and my_built_shared_libraries in # "LOCAL_STRIP_MODULE not true" because otherwise the rules are defined in dynamic_binary.mk. endif # LOCAL_STRIP_MODULE not true |