diff options
| author | Ying Wang <wangying@google.com> | 2015-01-23 00:14:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-23 00:14:26 +0000 |
| commit | 6aa932cabf6ed14c35ae49b78464e2504af87c58 (patch) | |
| tree | af0aee12a5e8675cd7ca49f68e5dc465dcbcf1b2 /core/binary.mk | |
| parent | 23396bfc8d613f9319bce836a49ae6ee7ad18c0b (diff) | |
| parent | 14d02a39b0e7874f905a19bc45270ec37704c2f3 (diff) | |
| download | build-6aa932cabf6ed14c35ae49b78464e2504af87c58.zip build-6aa932cabf6ed14c35ae49b78464e2504af87c58.tar.gz build-6aa932cabf6ed14c35ae49b78464e2504af87c58.tar.bz2 | |
Merge "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 d020846..224f328 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -840,11 +840,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 |