From 65760032f5887351537fb3d3e095392a8874aa88 Mon Sep 17 00:00:00 2001 From: Michael Scott Date: Thu, 22 Jan 2015 16:22:20 -0800 Subject: [PATCH] greybus: build: android: replace hard-coded build destination with variable Make sure destination for greybus modules is consistent and easier to maintain Signed-off-by: Michael Scott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/Android.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/staging/greybus/Android.mk b/drivers/staging/greybus/Android.mk index 924099b..5d96a24 100644 --- a/drivers/staging/greybus/Android.mk +++ b/drivers/staging/greybus/Android.mk @@ -2,13 +2,15 @@ $(PRODUCT_OUT)/ramdisk.img: build-greybus +GREYBUS_MODULE_OUT_PATH := $(PRODUCT_OUT)/root/lib/modules + include $(CLEAR_VARS) GREYBUS_SRC_PATH := $(ANDROID_BUILD_TOP)/external/greybus/ LOCAL_PATH := $(GREYBUS_SRC_PATH) LOCAL_SRC_FILES := greybus.ko LOCAL_MODULE := $(LOCAL_SRC_FILES) LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_PATH := $(PRODUCT_OUT)/root/lib/modules +LOCAL_MODULE_PATH := $(GREYBUS_MODULE_OUT_PATH) $(LOCAL_PATH)/$(LOCAL_SRC_FILES): build-greybus include $(BUILD_PREBUILT) @@ -26,5 +28,5 @@ build-greybus: android_kernel make clean -C $(GREYBUS_SRC_PATH) cd $(GREYBUS_SRC_PATH) &&\ $(MAKE) -j$(MAKE_JOBS) CROSS_COMPILE=$(KERNEL_TOOLS_PREFIX) $(ARGS) - mkdir -p $(PRODUCT_OUT)/root/lib/modules - cp $(GREYBUS_SRC_PATH)/greybus.ko $(PRODUCT_OUT)/root/lib/modules + mkdir -p $(GREYBUS_MODULE_OUT_PATH) + cp $(GREYBUS_SRC_PATH)/greybus.ko $(GREYBUS_MODULE_OUT_PATH) -- 2.7.4