diff options
| author | Ying Wang <wangying@google.com> | 2014-06-10 14:21:20 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-06-10 14:30:30 -0700 |
| commit | e1b867dde77d59bb35f366c2e3d65fe37c696880 (patch) | |
| tree | cbe1915dd77dcc52e302d41d8665ee5e07216fc4 /core/prebuilt_internal.mk | |
| parent | 6cc4598d18c660d4e253970bc875be5fa08c770b (diff) | |
| download | build-e1b867dde77d59bb35f366c2e3d65fe37c696880.zip build-e1b867dde77d59bb35f366c2e3d65fe37c696880.tar.gz build-e1b867dde77d59bb35f366c2e3d65fe37c696880.tar.bz2 | |
Fix loophole in module expansion.
Previously we only expanded product_MODULES with LOCAL_REQUIRED_MODULES,
but not modules introduced by LOCAL_SHARED_LIBRARIES; Later we did a further
shared libary expansion in vendor_module_check.mk.
It couldn't track C in the following case:
A : B, by LOCAL_SHARED_LIBRARIES; B : C, by LOCAL_REQUIRED_MODULES.
With this change, we transformed the LOCAL_SHARED_LIBRARIES dependencies
into LOCAL_REQUIRED_MODULES dependencies before doing the required
module expansion and the loophole is closed.
All module names are now expanded to product_MODULES now and it makes
vendor_module_check.mk simpler.
Change-Id: I8835a478d2ce0ce10601a8449f446f07b01c2b7f
Diffstat (limited to 'core/prebuilt_internal.mk')
| -rw-r--r-- | core/prebuilt_internal.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index 7229b3a..4bcd70a 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -92,7 +92,7 @@ endif # prebuilt_module_is_a_library ifdef LOCAL_INSTALLED_MODULE ifdef LOCAL_SHARED_LIBRARIES $(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += \ - $(LOCAL_MODULE):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(LOCAL_SHARED_LIBRARIES)) + $(my_register_name):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(LOCAL_SHARED_LIBRARIES)) # We also need the LOCAL_BUILT_MODULE dependency, # since we use -rpath-link which points to the built module's path. |