Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14d02a39 authored by Ying Wang's avatar Ying Wang
Browse files

Add dependency of import_includes on LOCAL_MODULE_MAKEFILE 

So the build system regenerates import_includes when you modify
Android.mk to add a new dependency library.

Change-Id: Ic92b097b659bb68a9065e1d66da59e0dc7e2836a
parent 8f5fc9e2

core/binary.mk

+3 −2
Original line number Diff line number Diff line
@@ -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