diff options
| author | Ying Wang <wangying@google.com> | 2015-01-23 00:50:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-23 00:50:39 +0000 |
| commit | de9b91b01bc9baff333ea7fbb438e0e838fac204 (patch) | |
| tree | 5537aaf3c0135cbcb5f8d5c1cff1ab8d30ee0669 /core/binary.mk | |
| parent | 5586efa028dfa466a724c4d80f1affd02de5c425 (diff) | |
| parent | 6aa932cabf6ed14c35ae49b78464e2504af87c58 (diff) | |
| download | build-de9b91b01bc9baff333ea7fbb438e0e838fac204.zip build-de9b91b01bc9baff333ea7fbb438e0e838fac204.tar.gz build-de9b91b01bc9baff333ea7fbb438e0e838fac204.tar.bz2 | |
am 6aa932ca: Merge "Add dependency of import_includes on LOCAL_MODULE_MAKEFILE"
* commit '6aa932cabf6ed14c35ae49b78464e2504af87c58':
Add dependency of import_includes on LOCAL_MODULE_MAKEFILE
Diffstat (limited to 'core/binary.mk')
| -rw-r--r-- | core/binary.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/binary.mk b/core/binary.mk index 386b736..105082b 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -842,11 +842,12 @@ import_includes_deps := $(strip \ $(call intermediates-dir-for,SHARED_LIBRARIES,$(l),$(LOCAL_IS_HOST_MODULE),,$(LOCAL_2ND_ARCH_VAR_PREFIX))/export_includes) \ $(foreach l, $(my_static_libraries) $(my_whole_static_libraries), \ $(call intermediates-dir-for,STATIC_LIBRARIES,$(l),$(LOCAL_IS_HOST_MODULE),,$(LOCAL_2ND_ARCH_VAR_PREFIX))/export_includes)) -$(import_includes) : $(import_includes_deps) +$(import_includes): PRIVATE_IMPORT_EXPORT_INCLUDES := $(import_includes_deps) +$(import_includes) : $(LOCAL_MODULE_MAKEFILE) $(import_includes_deps) @echo Import includes file: $@ $(hide) mkdir -p $(dir $@) && rm -f $@ ifdef import_includes_deps - $(hide) for f in $^; do \ + $(hide) for f in $(PRIVATE_IMPORT_EXPORT_INCLUDES); do \ cat $$f >> $@; \ done else |