diff options
| author | Jeff Davidson <jpd@google.com> | 2015-01-09 02:37:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-09 02:37:16 +0000 |
| commit | dd198b77a1bae9974b741cc7d1dad328dce3c3b6 (patch) | |
| tree | 424d11c3df6451e7825db6ab6be1a5ea08675440 | |
| parent | aa112716067167d58d1db37aaf8adc49b83b59a1 (diff) | |
| parent | 680f071ca4aca6e04dad00002042ffdc06391f78 (diff) | |
| download | build-dd198b77a1bae9974b741cc7d1dad328dce3c3b6.zip build-dd198b77a1bae9974b741cc7d1dad328dce3c3b6.tar.gz build-dd198b77a1bae9974b741cc7d1dad328dce3c3b6.tar.bz2 | |
Merge "Move installed module dependency setup after proto handling."
| -rw-r--r-- | core/binary.mk | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/core/binary.mk b/core/binary.mk index 752a5c3..22936b9 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -219,29 +219,6 @@ endif my_asflags += -D__ASSEMBLY__ -########################################################## -## Set up installed module dependency -## We cannot compute the full path of the LOCAL_SHARED_LIBRARIES for -## they may cusomize their install path with LOCAL_MODULE_PATH -########################################################## -# Get the list of INSTALLED libraries as module names. -ifdef LOCAL_SDK_VERSION - installed_shared_library_module_names := \ - $(my_shared_libraries) -else - installed_shared_library_module_names := \ - $(my_shared_libraries) $(my_system_shared_libraries) -endif - -# 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),$(sort $(installed_shared_library_module_names))) -endif -endif - ########################################################### ## Define PRIVATE_ variables from global vars ########################################################### @@ -833,6 +810,31 @@ asm_objects += $(asm_objects_asm) endif endif + +########################################################## +## Set up installed module dependency +## We cannot compute the full path of the LOCAL_SHARED_LIBRARIES for +## they may cusomize their install path with LOCAL_MODULE_PATH +########################################################## +# Get the list of INSTALLED libraries as module names. +ifdef LOCAL_SDK_VERSION + installed_shared_library_module_names := \ + $(my_shared_libraries) +else + installed_shared_library_module_names := \ + $(my_shared_libraries) $(my_system_shared_libraries) +endif + +# 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),$(sort $(installed_shared_library_module_names))) +endif +endif + + #################################################### ## Import includes #################################################### |