>From e4cc1a844c65a28ea8ed5bffd21b1e073042c222 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Wed, 4 Jul 2012 13:35:10 +0200 Subject: [PATCH] Avoid creating busybox objects in the source directory --- Android.mk | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/Android.mk b/Android.mk index 77df92e..6fc4f6e 100644 --- a/Android.mk +++ b/Android.mk @@ -1,26 +1,30 @@ +BB_PATH := $(call my-dir) + include $(CLEAR_VARS) -BB_TC_DIR := $(realpath $(shell dirname $(TARGET_TOOLS_PREFIX))) -BB_TC_PREFIX := $(shell basename $(TARGET_TOOLS_PREFIX)) -BB_LDFLAGS := -Xlinker -z -Xlinker muldefs -nostdlib -Bdynamic -Xlinker -T../../$(BUILD_SYSTEM)/armelf.x -Xlinker -dynamic-linker -Xlinker /system/bin/linker -Xlinker -z -Xlinker nocopyreloc -Xlinker --no-undefined ../../$(TARGET_CRTBEGIN_DYNAMIC_O) ../../$(TARGET_CRTEND_O) -L../../$(TARGET_OUT_STATIC_LIBRARIES) +BB_LDFLAGS := -Xlinker -z -Xlinker muldefs -nostdlib -Bdynamic -Xlinker -T$(CURDIR)/$(BUILD_SYSTEM)/armelf.x -Xlinker -dynamic-linker -Xlinker /system/bin/linker -Xlinker -z -Xlinker nocopyreloc -Xlinker --no-undefined $(CURDIR)/$(TARGET_CRTBEGIN_DYNAMIC_O) $(CURDIR)/$(TARGET_CRTEND_O) -L$(CURDIR)/$(TARGET_OUT_STATIC_LIBRARIES) # FIXME remove -fno-strict-aliasing once all aliasing violations are fixed -BB_COMPILER_FLAGS := $(subst -I ,-I../../,$(subst -include ,-include ../../,$(TARGET_GLOBAL_CFLAGS))) -I../../bionic/libc/include -I../../bionic/libc/kernel/common -I../../bionic/libc/arch-arm/include -I../../bionic/libc/kernel/arch-arm -I../../bionic/libm/include -fno-stack-protector -Wno-error=format-security -fno-strict-aliasing +BB_COMPILER_FLAGS := $(subst -I ,-I$(CURDIR)/,$(subst -include ,-include $(CURDIR)/,$(TARGET_GLOBAL_CFLAGS))) $(foreach d,$(TARGET_C_INCLUDES),-I$(CURDIR)/$(d)) -fno-stack-protector -Wno-error=format-security -fno-strict-aliasing BB_LDLIBS := dl m c gcc ifneq ($(strip $(SHOW_COMMANDS)),) BB_VERBOSE="V=1" endif -.PHONY: busybox +LOCAL_MODULE := busybox +LOCAL_MODULE_CLASS := EXECUTABLES +LOCAL_MODULE_TAGS := optional + +include $(BUILD_PREBUILT) + +BB_OUT_INTERMEDIATES := $(dir $(LOCAL_BUILT_MODULE)) + +BB_MAKE_FLAGS := O=$(CURDIR)/$(BB_OUT_INTERMEDIATES) CROSS_COMPILE=$(notdir $(TARGET_TOOLS_PREFIX)) CONFIG_EXTRA_CFLAGS="$(BB_COMPILER_FLAGS)" EXTRA_LDFLAGS="$(BB_LDFLAGS)" LDLIBS="$(BB_LDLIBS)" $(BB_VERBOSE) -droid: busybox +$(BB_OUT_INTERMEDIATES): + mkdir -p $@ -systemtarball: busybox +$(BB_OUT_INTERMEDIATES)/.config: $(BB_PATH)/configs/android_defconfig | $(BB_OUT_INTERMEDIATES) + $(MAKE) -C $(BB_PATH) android_defconfig $(BB_MAKE_FLAGS) -busybox: $(TARGET_CRTBEGIN_DYNAMIC_O) $(TARGET_CRTEND_O) $(TARGET_OUT_STATIC_LIBRARIES)/libm.so $(TARGET_OUT_STATIC_LIBRARIES)/libc.so $(TARGET_OUT_STATIC_LIBRARIES)/libdl.so - cd external/busybox && \ - sed -e "s|^CONFIG_CROSS_COMPILER_PREFIX=.*|CONFIG_CROSS_COMPILER_PREFIX=\"$(BB_TC_PREFIX)\"|;s|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS=\"$(BB_COMPILER_FLAGS)\"|" configs/android_defconfig >.config && \ - export PATH=$(BB_TC_DIR):$(PATH) && \ - $(MAKE) oldconfig && \ - $(MAKE) $(BB_VERBOSE) EXTRA_LDFLAGS="$(BB_LDFLAGS)" LDLIBS="$(BB_LDLIBS)" && \ - mkdir -p ../../$(PRODUCT_OUT)/system/bin && \ - cp busybox ../../$(PRODUCT_OUT)/system/bin/ +$(LOCAL_BUILT_MODULE): $(TARGET_CRTBEGIN_DYNAMIC_O) $(TARGET_CRTEND_O) $(TARGET_OUT_SHARED_LIBRARIES)/libm.so $(TARGET_OUT_SHARED_LIBRARIES)/libc.so $(TARGET_OUT_SHARED_LIBRARIES)/libdl.so $(BB_OUT_INTERMEDIATES)/.config FORCE + $(MAKE) -C $(BB_PATH) $(BB_MAKE_FLAGS) -- 1.7.10