The workaround might have been necessary in the past, however now it
produces the following error:
.../libnl.a(attr.o): multiple definition of 'nla_put_flag'
.../android-nl.o: previous definition here
collect2: error: ld returned 1 exit status
TEST=Built AOSP tree with this patchset, tested the generated iw binary.
Signed-off-by: Filipe Brandenburger <filbranden@xxxxxxxxxx>
---
Android.mk | 2 +-
android-nl.c | 6 ------
2 files changed, 1 insertion(+), 7 deletions(-)
delete mode 100644 android-nl.c
diff --git a/Android.mk b/Android.mk
index 0820892c6c19..8d6567f624c1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,7 +7,7 @@ IW_ANDROID_BUILD=y
NO_PKG_CONFIG=y
include $(LOCAL_PATH)/Makefile
-LOCAL_SRC_FILES := $(patsubst %.o,%.c,$(OBJS)) android-nl.c
+LOCAL_SRC_FILES := $(patsubst %.o,%.c,$(OBJS))
LOCAL_C_INCLUDES := \
$(LOCAL_PATH) \
diff --git a/android-nl.c b/android-nl.c
deleted file mode 100644
index d216f5fe8680..000000000000
--- a/android-nl.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <netlink/attr.h>
-
-int nla_put_flag(struct nl_msg *msg, int flag)
-{
- return nla_put(msg, flag, 0, NULL);
-}
--
2.5.0.rc2.392.g76e840b
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
