commit a2ccae2546db082e571168650b279125bfceb861
author Colin Cross <ccross@android.com> Thu Oct 24 01:23:34 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 24 01:23:34 2013 +0000
tree 22a34cbfefdb584798934d5277c2becc3c6f3bc9
parent a7b5c4a7dc77a0896d6314828b9ce85f82d103e8
parent a6c4ebdd112409e2b53fe0dfffcaa9dab17dd68f

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

core/copy_headers.mk

diff --git a/core/copy_headers.mk b/core/copy_headers.mk
index dac07d5..e16560f 100644
--- a/core/copy_headers.mk
+++ b/core/copy_headers.mk
@@ -15,7 +15,9 @@
 $(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)) \
  )