diff options
| author | Ying Wang <wangying@google.com> | 2014-05-19 13:03:36 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-05-19 13:03:36 -0700 |
| commit | 3380d3a1ae64667f130273a78a42b81c7296b595 (patch) | |
| tree | 8b03b70f60d51ef08e6787e3d92fc88bebd70153 /core/base_rules.mk | |
| parent | 9b9b98376a60f080f56a72f564dd83a890f2663c (diff) | |
| download | build-3380d3a1ae64667f130273a78a42b81c7296b595.zip build-3380d3a1ae64667f130273a78a42b81c7296b595.tar.gz build-3380d3a1ae64667f130273a78a42b81c7296b595.tar.bz2 | |
Explicit record the modules' built-file:installed-file
- This simplifies the logic to get the mapping of built-file to
installed-file. Previously we used file suffix matching which is error
prone and not scalable.
- With this change the .odex files will be included automatically.
Bug: 13585955
Change-Id: I4599abf93b9d501bac7aca7758d7f3aee21b3e36
Diffstat (limited to 'core/base_rules.mk')
| -rw-r--r-- | core/base_rules.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 985a933..9354764 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -594,8 +594,12 @@ ALL_MODULES.$(my_register_name).CHECKED := \ $(ALL_MODULES.$(my_register_name).CHECKED) $(LOCAL_CHECKED_MODULE) ALL_MODULES.$(my_register_name).BUILT := \ $(ALL_MODULES.$(my_register_name).BUILT) $(LOCAL_BUILT_MODULE) +ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) ALL_MODULES.$(my_register_name).INSTALLED := \ $(strip $(ALL_MODULES.$(my_register_name).INSTALLED) $(LOCAL_INSTALLED_MODULE)) +ALL_MODULES.$(my_register_name).BUILT_INSTALLED := \ + $(strip $(ALL_MODULES.$(my_register_name).BUILT_INSTALLED)$(LOCAL_BUILT_MODULE):$(LOCAL_INSTALLED_MODULE)) +endif ifdef LOCAL_PICKUP_FILES # Files or directories ready to pick up by the build system # when $(LOCAL_BUILT_MODULE) is done. |