p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use $(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES 

To disentangle the host/target shared library dependencies.

Change-Id: I3122b370a7c24425861ab6dba91e6d8d84b27249
This commit is contained in:
Ying Wang 2013-02-25 18:12:11 -08:00
parent f7084ca921
commit 6c86a133c7
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/prebuilt.mk
View File

@ -39,9 +39,6 @@ else
prebuilt_module_is_a_library := prebuilt_module_is_a_library :=
endif endif
# Install the shared libraries if necessary
LOCAL_REQUIRED_MODULES += $(LOCAL_SHARED_LIBRARIES)
# Don't install static libraries by default. # Don't install static libraries by default.
ifndef LOCAL_UNINSTALLABLE_MODULE ifndef LOCAL_UNINSTALLABLE_MODULE
ifeq (STATIC_LIBRARIES,$(LOCAL_MODULE_CLASS)) ifeq (STATIC_LIBRARIES,$(LOCAL_MODULE_CLASS))
@ -61,7 +58,7 @@ ifeq ($(LOCAL_STRIP_MODULE),true)
endif endif
include $(BUILD_SYSTEM)/dynamic_binary.mk include $(BUILD_SYSTEM)/dynamic_binary.mk
built_module := $(linked_module) built_module := $(linked_module)
else else # LOCAL_STRIP_MODULE not true
include $(BUILD_SYSTEM)/base_rules.mk include $(BUILD_SYSTEM)/base_rules.mk
built_module := $(LOCAL_BUILT_MODULE) built_module := $(LOCAL_BUILT_MODULE)
@ -81,7 +78,16 @@ endif
$(LOCAL_BUILT_MODULE) : | $(intermediates)/export_includes $(LOCAL_BUILT_MODULE) : | $(intermediates)/export_includes
endif # prebuilt_module_is_a_library endif # prebuilt_module_is_a_library
# 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 LOCAL_SHARED_LIBRARIES
$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += $(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(LOCAL_SHARED_LIBRARIES))
endif endif
endif
endif # LOCAL_STRIP_MODULE not true
PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES)) PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))