diff options
| author | Ying Wang <wangying@google.com> | 2015-01-23 03:11:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-23 03:11:04 +0000 |
| commit | 28aa6108606c1706a5faed03f6436c1a0c28a577 (patch) | |
| tree | 24aaf0380f5e1d0ef70221b8db141feaedfb25ed /core/binary.mk | |
| parent | 6c5ee97ce2e638cc0aa00915ead6328ddee24644 (diff) | |
| parent | de9b91b01bc9baff333ea7fbb438e0e838fac204 (diff) | |
| download | build-28aa6108606c1706a5faed03f6436c1a0c28a577.zip build-28aa6108606c1706a5faed03f6436c1a0c28a577.tar.gz build-28aa6108606c1706a5faed03f6436c1a0c28a577.tar.bz2 | |
am de9b91b0: am 6aa932ca: Merge "Add dependency of import_includes on LOCAL_MODULE_MAKEFILE"
* commit 'de9b91b01bc9baff333ea7fbb438e0e838fac204':
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 2f99d43..008fa69 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -847,11 +847,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 |