summaryrefslogtreecommitdiff
authorTanguy Pruvot <tanguy.pruvot@gmail.com>2014-08-06 23:10:32 (GMT)
committer Tanguy Pruvot <tanguy.pruvot@gmail.com>2014-08-10 10:50:10 (GMT)
commitc9b3fd24b911fa25ae0f493e88b0a4c7006ca9f3 (patch)
tree578cc6eac046f69d7c8abd77448238b1a58f9749
parentd4d813326ca5a923d876f6320290fe8336a6dc7b (diff)
downloadbusybox-c9b3fd24b911fa25ae0f493e88b0a4c7006ca9f3.zip
busybox-c9b3fd24b911fa25ae0f493e88b0a4c7006ca9f3.tar.gz
busybox-c9b3fd24b911fa25ae0f493e88b0a4c7006ca9f3.tar.bz2
Android: clean only objects, not the folders
Some users building with a high number of threads reported to me problems regarding the import_includes folder. So, only delete objects files (.o) and keep import_includes Change-Id: Ibf3ac818ff2bcf00bdf4f5243112001e2b2e15ef
Diffstat
-rw-r--r--Android.mk8
1 files changed, 2 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk
index 17d72ce..44aa9e3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -55,9 +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 $(TARGET_OUT_INTERMEDIATES)/EXECUTABLES/busybox_intermediates
- @touch $(TARGET_OUT_INTERMEDIATES)/EXECUTABLES/busybox_intermediates/import_includes
+ @rm -f $(shell find $(abspath $(call intermediates-dir-for,EXECUTABLES,busyboxsf)) -name "*.o")
@mkdir -p $(@D)
@cat $^ > $@ && echo "CONFIG_CROSS_COMPILER_PREFIX=\"$(BUSYBOX_CROSS_COMPILER_PREFIX)\"" >> $@
+make -C $(BB_PATH) prepare O=$(@D) $(BB_PREPARE_FLAGS)
@@ -66,9 +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 $(TARGET_OUT_INTERMEDIATES)/STATIC_LIBRARIES/libbusybox_intermediates
- @touch $(TARGET_OUT_INTERMEDIATES)/STATIC_LIBRARIES/libbusybox_intermediates/import_includes
+ @rm -f $(shell find $(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,libbusybox)) -name "*.o")
@mkdir -p $(@D)
@cat $^ > $@ && echo "CONFIG_CROSS_COMPILER_PREFIX=\"$(BUSYBOX_CROSS_COMPILER_PREFIX)\"" >> $@
+make -C $(BB_PATH) prepare O=$(@D) $(BB_PREPARE_FLAGS)