diff options
| author | Filipe Brandenburger <filbranden@google.com> | 2015-07-30 11:18:32 -0700 |
|---|---|---|
| committer | Filipe Brandenburger <filbranden@google.com> | 2015-08-03 15:45:04 -0700 |
| commit | 3feeefee6cb060a1b717e4968bac06ab99626dd0 (patch) | |
| tree | e7cf52973f2d341dea776ec0d2302a51d91ed182 | |
| parent | aa24a0a0d7dba666349d2138fc6b2fda5287b55d (diff) | |
| download | iw-3feeefee6cb060a1b717e4968bac06ab99626dd0.tar.gz | |
iw: remove android-nl.c with unneeded workaround
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.
Change-Id: I932d6d3530f0aaea3dd822d48a74344be35b383a
Signed-off-by: Filipe Brandenburger <filbranden@google.com>
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | android-nl.c | 6 |
2 files changed, 1 insertions, 7 deletions
@@ -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_CFLAGS += -DCONFIG_LIBNL20 LOCAL_LDFLAGS := -Wl,--no-gc-sections diff --git a/android-nl.c b/android-nl.c deleted file mode 100644 index d216f5f..0000000 --- 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); -} |