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

Commit a6c4ebdd authored by Colin Cross's avatar Colin Cross
Browse files

avoid // in copy headers rule 

If LOCAL_COPY_HEADERS_TO is not set, then the copy headers rule
target is set to out/target/product/../obj/include//header.h.
If another rule depends on the header without the //, it will
fail.  Don't insert LOCAL_COPY_HEADERS_TO if it is blank.

Change-Id: Ideac7f8e01288ab5cca98645b307945d6ae9e97c
parent 0068d25b

core/copy_headers.mk

+3 −1
Original line number Diff line number Diff line
@@ -15,7 +15,9 @@ endif 
$(foreach header,$(LOCAL_COPY_HEADERS), \

  $(eval _chFrom := $(LOCAL_PATH)/$(header)) \

  $(eval _chTo := \

      $($(my_prefix)OUT_HEADERS)/$(LOCAL_COPY_HEADERS_TO)/$(notdir $(header))) \

      $(if $(LOCAL_COPY_HEADERS_TO),\

        $($(my_prefix)OUT_HEADERS)/$(LOCAL_COPY_HEADERS_TO)/$(notdir $(header)),\

        $($(my_prefix)OUT_HEADERS)/$(notdir $(header)))) \

  $(eval $(call copy-one-header,$(_chFrom),$(_chTo))) \

  $(eval all_copied_headers: $(_chTo)) \

 )