From a6c4ebdd112409e2b53fe0dfffcaa9dab17dd68f Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 22 Oct 2013 12:24:21 -0700 Subject: 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 --- core/copy_headers.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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)) \ ) -- cgit v1.1