summaryrefslogtreecommitdiff
authorTanguy Pruvot <tanguy.pruvot@gmail.com>2014-08-05 04:04:46 (GMT)
committer Tanguy Pruvot <tanguy.pruvot@gmail.com>2014-08-05 05:06:54 (GMT)
commite553d6586ca3dded0eec4905822cf24f26419b68 (patch)
tree683fd60247c11eaa60d18d2c0f948d201e4f4e81
parent1071f3eba24b629a3ddee740d39344f8cd1aec19 (diff)
downloadbusybox-e553d6586ca3dded0eec4905822cf24f26419b68.zip
busybox-e553d6586ca3dded0eec4905822cf24f26419b68.tar.gz
busybox-e553d6586ca3dded0eec4905822cf24f26419b68.tar.bz2
android: on prepare, clean all intermediates
This was requested to me to prevent no clobbered builds failures on busybox config changes. Change-Id: I1bdf2948e0669b1de567381eb809f576e8f1eef5
Diffstat
-rw-r--r--Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index fc1d29c..c28137f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -55,6 +55,7 @@ busybox_prepare_full := $(bb_gen)/full/.config
$(busybox_prepare_full): $(BB_PATH)/busybox-full.config
@echo -e ${CL_YLW}"Prepare config for busybox binary"${CL_RST}
@rm -rf $(bb_gen)/full
+ @rm -rf $(TARGET_OUT_INTERMEDIATES)/EXECUTABLES/busybox_intermediates
@mkdir -p $(@D)
@cat $^ > $@ && echo "CONFIG_CROSS_COMPILER_PREFIX=\"$(BUSYBOX_CROSS_COMPILER_PREFIX)\"" >> $@
make -C $(BB_PATH) prepare O=$(@D) $(BB_PREPARE_FLAGS)
@@ -63,6 +64,7 @@ busybox_prepare_minimal := $(bb_gen)/minimal/.config
$(busybox_prepare_minimal): $(BB_PATH)/busybox-minimal.config
@echo -e ${CL_YLW}"Prepare config for libbusybox"${CL_RST}
@rm -rf $(bb_gen)/minimal
+ @rm -rf $(TARGET_OUT_INTERMEDIATES)/STATIC_LIBRARIES/libbusybox_intermediates
@mkdir -p $(@D)
@cat $^ > $@ && echo "CONFIG_CROSS_COMPILER_PREFIX=\"$(BUSYBOX_CROSS_COMPILER_PREFIX)\"" >> $@
make -C $(BB_PATH) prepare O=$(@D) $(BB_PREPARE_FLAGS)