StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d274e04a: Merge "Don\'t sort shared library link order."

Browse Source 
* commit 'd274e04ac4317d7cfc2de02ca215e064c018c234':
  Don't sort shared library link order.
This commit is contained in:
Dan Albert
2014-10-28 04:46:53 +00:00
committed by Android Git Automerger
parent 6555580d35 d274e04ac4
commit ef8912d93f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/binary.mk
View File

@@ -237,16 +237,15 @@ ifdef LOCAL_SDK_VERSION
$(my_shared_libraries) $(my_shared_libraries)
else else
installed_shared_library_module_names := \ installed_shared_library_module_names := \
$(my_system_shared_libraries) $(my_shared_libraries) $(my_shared_libraries) $(my_system_shared_libraries)
endif endif
installed_shared_library_module_names := $(sort $(installed_shared_library_module_names))
# The real dependency will be added after all Android.mks are loaded and the install paths # The real dependency will be added after all Android.mks are loaded and the install paths
# of the shared libraries are determined. # of the shared libraries are determined.
ifdef LOCAL_INSTALLED_MODULE ifdef LOCAL_INSTALLED_MODULE
ifdef installed_shared_library_module_names ifdef installed_shared_library_module_names
$(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += \ $(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += \
$(my_register_name):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(installed_shared_library_module_names)) $(my_register_name):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(sort $(installed_shared_library_module_names)))
endif endif
endif endif