commit d274e04ac4317d7cfc2de02ca215e064c018c234
author Dan Albert <danalbert@google.com> Thu Oct 23 22:20:01 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 23 22:20:01 2014 +0000
tree 5fbb0ca8c50e7b549c9607554ca91ca2cdcea77c
parent ea503d21c7d5ecb3deacbf50f3ec7366bf7bd573
parent 04eead7e2bd6e54d08e5e567acfca8c446628f42

Merge "Don't sort shared library link order."

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 750e783..5774357 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -235,16 +235,15 @@
       $(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