am a2ccae25: Merge "avoid // in copy headers rule" into klp-dev

* commit 'a2ccae2546db082e571168650b279125bfceb861':
  avoid // in copy headers rule
This commit is contained in:
Colin Cross 2013-10-23 18:30:02 -07:00 committed by Android Git Automerger
commit 2df0464a54
1 changed files with 3 additions and 1 deletions

View File

@ -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)) \
)