2015-01-06 10:49:54

by Arik Nemtsov

[permalink] [raw]
Subject: [PATCH] iw: don't define iw target in Android build

Otherwise Android gets confused and tries to build the Makefile target

Signed-off-by: Arik Nemtsov <[email protected]>
---
Android.mk | 1 +
Makefile | 2 ++
2 files changed, 3 insertions(+)

diff --git a/Android.mk b/Android.mk
index 8afda1d..00c8c49 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,6 +3,7 @@ IW_SOURCE_DIR := $(LOCAL_PATH)

include $(CLEAR_VARS)

+IW_ANDROID_BUILD=y
NO_PKG_CONFIG=y
include $(LOCAL_PATH)/Makefile

diff --git a/Makefile b/Makefile
index 5bf955d..58755dc 100644
--- a/Makefile
+++ b/Makefile
@@ -101,9 +101,11 @@ version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefil
@$(NQ) ' CC ' $@
$(Q)$(CC) $(CFLAGS) -c -o $@ $<

+ifeq ($(IW_ANDROID_BUILD),)
iw: $(OBJS)
@$(NQ) ' CC ' iw
$(Q)$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o iw
+endif

check:
$(Q)$(MAKE) all CC="REAL_CC=$(CC) CHECK=\"sparse -Wall\" cgcc"
--
2.1.0