| author | Tanguy Pruvot <tanguy.pruvot@gmail.com> | 2014-08-05 09:24:28 (GMT) |
|---|---|---|
| committer | Tanguy Pruvot <tanguy.pruvot@gmail.com> | 2014-08-05 09:26:01 (GMT) |
| commit | 57da4a8052a09fd7f9ade2db3896b5ec14fc88f2 (patch) | |
| tree | 104cef267baf288f5bb12da2e83555c48a3f0f51 | |
| parent | 37d7f5f3e730c824d27417fbd57003a6a5034367 (diff) | |
| download | busybox-57da4a8052a09fd7f9ade2db3896b5ec14fc88f2.zip busybox-57da4a8052a09fd7f9ade2db3896b5ec14fc88f2.tar.gz busybox-57da4a8052a09fd7f9ade2db3896b5ec14fc88f2.tar.bz2 | |
Android.mk: prevent warnings on make prepare
Add "+" to allow a new job
touch import_includes to prevent problems with -jN
Change-Id: Iea3cd527842a8bd770ff56fce01bcd0ff2d0db83
| -rw-r--r-- | Android.mk | 8 | ||||
| -rw-r--r-- | CleanSpec.mk | 14 |
2 files changed, 17 insertions, 5 deletions
@@ -56,18 +56,22 @@ $(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 @mkdir -p $(@D) @cat $^ > $@ && echo "CONFIG_CROSS_COMPILER_PREFIX=\"$(BUSYBOX_CROSS_COMPILER_PREFIX)\"" >> $@ - make -C $(BB_PATH) prepare O=$(@D) $(BB_PREPARE_FLAGS) + +make -C $(BB_PATH) prepare O=$(@D) $(BB_PREPARE_FLAGS) 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 @mkdir -p $(@D) @cat $^ > $@ && echo "CONFIG_CROSS_COMPILER_PREFIX=\"$(BUSYBOX_CROSS_COMPILER_PREFIX)\"" >> $@ - make -C $(BB_PATH) prepare O=$(@D) $(BB_PREPARE_FLAGS) + +make -C $(BB_PATH) prepare O=$(@D) $(BB_PREPARE_FLAGS) ##################################################################### diff --git a/CleanSpec.mk b/CleanSpec.mk index 7fc801d..92152f4 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -44,14 +44,22 @@ $(call add-clean-step, rm -f $(PRODUCT_OUT)/utilities/busybox) $(call add-clean-step, rm -f $(PRODUCT_OUT)/symbols/system/xbin/busybox) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/busybox) - $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/EXECUTABLES/busybox_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libbusybox_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/UTILITY_EXECUTABLES/static_busybox_intermediates) -$(call add-clean-step, rm -f external/busybox/.config) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/busybox) + +# remains from old build system */ +$(call add-clean-step, rm -f external/busybox/include/bbconfigopts.h) +$(call add-clean-step, rm -f external/busybox/include/autoconf.h) +$(call add-clean-step, rm -f external/busybox/include/applet_tables.h) $(call add-clean-step, rm -f external/busybox/include/applets.h) +$(call add-clean-step, rm -f external/busybox/.config) + +# force prepare +$(call add-clean-step, touch external/busybox/busybox-minimal.config) +$(call add-clean-step, touch external/busybox/busybox-full.config) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST |