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:07:00 -0700 |
| commit | 75e8fcbb6cc68a7c55a33d7545aa60cccda76ccd (patch) | |
| tree | e64ddee4686b766b09b851e5ef4efef3fe9960bd /core/prebuilt_internal.mk | |
| parent | 9bf56c5e911856bc55693f5723a53271147e583e (diff) | |
| download | build-75e8fcbb6cc68a7c55a33d7545aa60cccda76ccd.zip build-75e8fcbb6cc68a7c55a33d7545aa60cccda76ccd.tar.gz build-75e8fcbb6cc68a7c55a33d7545aa60cccda76ccd.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 | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index b5e5189..d852541 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -91,16 +91,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 |