summaryrefslogtreecommitdiff
authorTanguy Pruvot <tanguy.pruvot@gmail.com>2011-07-05 16:22:26 (GMT)
committer Tanguy Pruvot <tanguy.pruvot@gmail.com>2011-07-05 16:22:26 (GMT)
commitb2ccaf3f4723a5cebf6550142f2f71b9e8e769a4 (patch)
tree496c86de12c92f864d0613f1f2992e0069744c67
parentf233646a402f0892a814b700725173e7e8c5089e (diff)
downloadbusybox-b2ccaf3f4723a5cebf6550142f2f71b9e8e769a4.zip
busybox-b2ccaf3f4723a5cebf6550142f2f71b9e8e769a4.tar.gz
busybox-b2ccaf3f4723a5cebf6550142f2f71b9e8e769a4.tar.bz2
execute busybox_prepare without CFLAGS
Diffstat
-rw-r--r--Android.mk43
1 files changed, 23 insertions, 20 deletions
diff --git a/Android.mk b/Android.mk
index 6d4f2ce..cf06600 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,27 @@
LOCAL_PATH := $(call my-dir)
+# Execute make clean, make prepare and copy profiles required for normal & static busybox (recovery)
+
+include $(CLEAR_VARS)
+BUSYBOX_CONFIG := full minimal
+$(BUSYBOX_CONFIG):
+ @echo GENERATE INCLUDES FOR BUSYBOX $@
+ @cd $(LOCAL_PATH) && make clean
+ cp $(LOCAL_PATH)/.config-$@ $(LOCAL_PATH)/.config
+ cd $(LOCAL_PATH) && make prepare
+ @#cp $(LOCAL_PATH)/.config $(LOCAL_PATH)/.config-$@
+ @mkdir -p $(LOCAL_PATH)/include-$@
+ cp $(LOCAL_PATH)/include/*.h $(LOCAL_PATH)/include-$@/
+ @rm $(LOCAL_PATH)/include/usage_compressed.h
+ @rm $(LOCAL_PATH)/.config
+
+busybox_prepare: $(BUSYBOX_CONFIG)
+LOCAL_MODULE := busybox_prepare
+LOCAL_MODULE_TAGS := eng
+include $(BUILD_STATIC_LIBRARY)
+
+
+
# Make a static library for clearsilver's regex.
# This prevents multiple symbol definition error....
include $(CLEAR_VARS)
@@ -11,6 +33,7 @@ LOCAL_C_INCLUDES := \
include $(BUILD_STATIC_LIBRARY)
+
SUBMAKE := make -s -C $(LOCAL_PATH) CC=$(CC)
KERNEL_MODULES_DIR?=/system/lib/modules
@@ -48,26 +71,6 @@ BUSYBOX_CFLAGS = \
-D'BB_VER="$(strip $(shell $(SUBMAKE) kernelversion)) $(BUSYBOX_SUFFIX)"' -DBB_BT=AUTOCONF_TIMESTAMP
-# Execute make clean, make prepare and copy profiles required for normal & static busybox (recovery)
-
-include $(CLEAR_VARS)
-BUSYBOX_CONFIG := full minimal
-$(BUSYBOX_CONFIG):
- @echo GENERATE INCLUDES FOR BUSYBOX $@
- @cd $(LOCAL_PATH) && make clean
- cp $(LOCAL_PATH)/.config-$@ $(LOCAL_PATH)/.config
- cd $(LOCAL_PATH) && make prepare
- @#cp $(LOCAL_PATH)/.config $(LOCAL_PATH)/.config-$@
- @mkdir -p $(LOCAL_PATH)/include-$@
- cp $(LOCAL_PATH)/include/*.h $(LOCAL_PATH)/include-$@/
- @rm $(LOCAL_PATH)/include/usage_compressed.h
- @rm $(LOCAL_PATH)/.config
-
-busybox_prepare: $(BUSYBOX_CONFIG)
-LOCAL_MODULE := busybox_prepare
-LOCAL_MODULE_TAGS := eng
-include $(BUILD_STATIC_LIBRARY)
-
# Build the static lib for the recovery tool