| author | Tanguy Pruvot <tanguy.pruvot@gmail.com> | 2014-07-22 16:49:41 (GMT) |
|---|---|---|
| committer | Tanguy Pruvot <tanguy.pruvot@gmail.com> | 2014-07-22 16:52:06 (GMT) |
| commit | 4be591e31fbebd9ed88d88f93976e5a66265ee02 (patch) | |
| tree | 5a189b1869b65fb7a5b17e847f5de791b2555887 | |
| parent | 3862b5f1789a3a0f17f72566898cd5ef718f487e (diff) | |
| download | busybox-4be591e31fbebd9ed88d88f93976e5a66265ee02.zip busybox-4be591e31fbebd9ed88d88f93976e5a66265ee02.tar.gz busybox-4be591e31fbebd9ed88d88f93976e5a66265ee02.tar.bz2 | |
android: fix makefile to build on AOSP
relative path seems could be buggy on aosp,
also some remains in include could make problems.
Change-Id: I4fcbf1bb8d7588d670e2fc5f8beb71397175c8bb
| -rw-r--r-- | Android.mk | 8 | ||||
| -rw-r--r-- | CleanSpec.mk | 2 | ||||
| -rw-r--r-- | include/.gitignore | 9 |
3 files changed, 6 insertions, 13 deletions
@@ -57,15 +57,14 @@ $(LOCAL_MODULE): @mkdir -p $(bb_gen)/full/include cat $(BB_PATH)/.config-full > $(bb_gen)/full/.config @echo "CONFIG_CROSS_COMPILER_PREFIX=\"$(BUSYBOX_CROSS_COMPILER_PREFIX)\"" >> $(bb_gen)/full/.config - cd $(BB_PATH) && make prepare O=$(bb_gen)/full + cd $(BB_PATH) && make prepare O=$(ANDROID_BUILD_TOP)/$(bb_gen)/full + cd $(ANDROID_BUILD_TOP) include $(BUILD_PREBUILT) LOCAL_PATH := $(BB_PATH) include $(CLEAR_VARS) -bb_gen := $(TARGET_OUT_INTERMEDIATES)/busybox - LOCAL_MODULE := busybox_prepare_minimal LOCAL_MODULE_TAGS := eng debug LOCAL_MODULE_CLASS := ETC @@ -77,7 +76,8 @@ $(LOCAL_MODULE): @mkdir -p $(bb_gen)/minimal/include cat $(BB_PATH)/.config-minimal > $(bb_gen)/minimal/.config @echo "CONFIG_CROSS_COMPILER_PREFIX=\"$(BUSYBOX_CROSS_COMPILER_PREFIX)\"" >> $(bb_gen)/minimal/.config - cd $(BB_PATH) && make prepare O=$(bb_gen)/minimal + cd $(BB_PATH) && make prepare O=$(ANDROID_BUILD_TOP)/$(bb_gen)/minimal + cd $(ANDROID_BUILD_TOP) include $(BUILD_PREBUILT) diff --git a/CleanSpec.mk b/CleanSpec.mk index ea90eab..70694ec 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -50,6 +50,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libbusybox_int $(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 -f external/busybox/include/applet_tables.h) +$(call add-clean-step, rm -f external/busybox/include/applets.h) $(call add-clean-step, cd external/busybox && git clean -f -- include*) # ************************************************ diff --git a/include/.gitignore b/include/.gitignore index 9d9b6c4..50cf6de 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -1,10 +1 @@ /config - -/applets.h -/applet_tables.h -/autoconf.h -/bbconfigopts_bz2.h -/bbconfigopts.h -/NUM_APPLETS.h -/usage_compressed.h -/usage.h |