diff options
| author | Daniel Díaz <daniel.diaz@linaro.org> | 2015-10-03 07:48:22 -0500 |
|---|---|---|
| committer | Daniel Díaz <daniel.diaz@linaro.org> | 2015-10-03 10:06:28 -0500 |
| commit | bebfb13f9e5a85fcffb3ac1b9efd1f65e41e9d7b (patch) | |
| tree | 31c6b908dcaa5b35f99f52cfefe4b10128370742 | |
| parent | d5494140623d3204639c0c3c66e9071073b59b15 (diff) | |
| download | common-bebfb13f9e5a85fcffb3ac1b9efd1f65e41e9d7b.tar.gz | |
kernel.mk: Iron out quotation issues with Ninja.
Change-Id: I3eb229b465a6c2312e5ae95c684bfb9ffa4e31e9
Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
| -rw-r--r-- | tasks/kernel.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tasks/kernel.mk b/tasks/kernel.mk index 6729dce..752a69c 100644 --- a/tasks/kernel.mk +++ b/tasks/kernel.mk @@ -11,11 +11,12 @@ endif # so passing a relative TARGET_TOOLS_PREFIX won't work. ABS_TARGET_TOOLS_PREFIX = $(shell cd `dirname $(TARGET_TOOLS_PREFIX)` && pwd)/$(shell basename $(TARGET_TOOLS_PREFIX)) -KERNEL_TOOLS_PREFIX ?= $(ABS_TARGET_TOOLS_PREFIX) +UNRESOLVED_KERNEL_TOOLS_PREFIX ?= $(ABS_TARGET_TOOLS_PREFIX) +KERNEL_TOOLS_PREFIX := $(UNRESOLVED_KERNEL_TOOLS_PREFIX) REALTOP=$(realpath $(TOP)) -KERNEL_OUT=$(realpath $(PRODUCT_OUT))/obj/kernel +KERNEL_OUT:=$(realpath $(PRODUCT_OUT))/obj/kernel # Certain devices load mmc driver as module and hence kernel module need to be in initrd TARGET_MODULES_OUT ?= $(TARGET_OUT) @@ -107,7 +108,7 @@ android_kernel_modules: $(INSTALLED_KERNEL_TARGET) $(ACP) if [ -e $${KTP}ld.bfd ]; then LD=$${KTP}ld.bfd; else LD=$${KTP}ld; fi && \ $(MAKE) O=$(KERNEL_OUT) ARCH=$(ARCH) CROSS_COMPILE="$${KTP}" KCFLAGS="$(TARGET_EXTRA_CFLAGS) -fno-pic $(LOCAL_CFLAGS)" LD="$${LD}" modules_install INSTALL_MOD_PATH=$(KERNEL_OUT)/modules_for_android mkdir -p $(TARGET_MODULES_OUT)/modules - find $(KERNEL_OUT)/modules_for_android -name "*.ko" -exec $(ACP) -fpt {} $(TARGET_MODULES_OUT)/modules/ \; + find $(KERNEL_OUT)/modules_for_android -name "*.ko" | xargs -I % $(ACP) -fpt % $(TARGET_MODULES_OUT)/modules/ else android_kernel_modules: endif |