summaryrefslogtreecommitdiff
authorTanguy Pruvot <tanguy.pruvot@gmail.com>2014-07-22 16:56:44 (GMT)
committer Tanguy Pruvot <tanguy.pruvot@gmail.com>2014-07-22 16:56:47 (GMT)
commit266892e6b300085e3220e180f303280ef1f5745c (patch)
tree94bb752891efb97fdcc746894b5675b0417a5081
parent4be591e31fbebd9ed88d88f93976e5a66265ee02 (diff)
downloadbusybox-266892e6b300085e3220e180f303280ef1f5745c.zip
busybox-266892e6b300085e3220e180f303280ef1f5745c.tar.gz
busybox-266892e6b300085e3220e180f303280ef1f5745c.tar.bz2
android: fix simple path for cm, add note for later
current AOSP (master) seems a bit different regarding the variable $(TARGET_OUT_INTERMEDIATES) Change-Id: I4a92743124950fadffcbff2b88f455db09a45d9e
Diffstat
-rw-r--r--Android.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 20ed3e0..752f541 100644
--- a/Android.mk
+++ b/Android.mk
@@ -57,9 +57,11 @@ $(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=$(ANDROID_BUILD_TOP)/$(bb_gen)/full
+ cd $(BB_PATH) && make prepare O=$(bb_gen)/full
cd $(ANDROID_BUILD_TOP)
+# note: aosp may require O=$(ANDROID_BUILD_TOP)/$(bb_gen)/...
+
include $(BUILD_PREBUILT)
LOCAL_PATH := $(BB_PATH)
@@ -76,7 +78,7 @@ $(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=$(ANDROID_BUILD_TOP)/$(bb_gen)/minimal
+ cd $(BB_PATH) && make prepare O=$(bb_gen)/minimal
cd $(ANDROID_BUILD_TOP)
include $(BUILD_PREBUILT)