diff options
| author | Colin Cross <ccross@android.com> | 2013-10-24 01:23:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-24 01:23:34 +0000 |
| commit | a2ccae2546db082e571168650b279125bfceb861 (patch) | |
| tree | 22a34cbfefdb584798934d5277c2becc3c6f3bc9 | |
| parent | a7b5c4a7dc77a0896d6314828b9ce85f82d103e8 (diff) | |
| parent | a6c4ebdd112409e2b53fe0dfffcaa9dab17dd68f (diff) | |
| download | build-a2ccae2546db082e571168650b279125bfceb861.zip build-a2ccae2546db082e571168650b279125bfceb861.tar.gz build-a2ccae2546db082e571168650b279125bfceb861.tar.bz2 | |
Merge "avoid // in copy headers rule" into klp-dev
| -rw-r--r-- | core/copy_headers.mk | 4 |
1 files changed, 3 insertions, 1 deletions
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 @@ 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)) \ ) |