diff options
| author | Dan Albert <danalbert@google.com> | 2014-10-29 17:11:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-29 17:11:50 +0000 |
| commit | d905ec2ac6b1277d59b21b74f8632c34fdf1b9a9 (patch) | |
| tree | cc53aae42408c74a309e12de8f70a4ac84e272f2 /core/binary.mk | |
| parent | 3b5261ac75f7d8d912e92fcdfdd76534a9bbe41b (diff) | |
| parent | ef8912d93f5ca3722d761da6c0b0f05e2480a41d (diff) | |
| download | build-d905ec2ac6b1277d59b21b74f8632c34fdf1b9a9.zip build-d905ec2ac6b1277d59b21b74f8632c34fdf1b9a9.tar.gz build-d905ec2ac6b1277d59b21b74f8632c34fdf1b9a9.tar.bz2 | |
am ef8912d9: am d274e04a: Merge "Don\'t sort shared library link order."
* commit 'ef8912d93f5ca3722d761da6c0b0f05e2480a41d':
Don't sort shared library link order.
Diffstat (limited to 'core/binary.mk')
| -rw-r--r-- | core/binary.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/binary.mk b/core/binary.mk index 7b51bc2..19010bc 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -239,16 +239,15 @@ ifdef LOCAL_SDK_VERSION $(my_shared_libraries) else installed_shared_library_module_names := \ - $(my_system_shared_libraries) $(my_shared_libraries) + $(my_shared_libraries) $(my_system_shared_libraries) 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 # of the shared libraries are determined. ifdef LOCAL_INSTALLED_MODULE ifdef installed_shared_library_module_names $(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 |