diff options
author | Filipe Brandenburger <filbranden@google.com> | 2015-08-12 11:02:46 -0700 |
---|---|---|
committer | Filipe Brandenburger <filbranden@google.com> | 2015-08-12 11:04:23 -0700 |
commit | 3c9cd07dda0b078a8394a9e3d02956655069ab27 (patch) | |
tree | c3599b8b27836650243697fffa115bd5cc24f7cc | |
parent | 087d778f6f82346debfd275ddbb8f646f9a1a167 (diff) | |
parent | 1179fd8dff9668cf12f32036d1e011bf1ee71f74 (diff) | |
download | platform_external_iw-3c9cd07dda0b078a8394a9e3d02956655069ab27.tar.gz platform_external_iw-3c9cd07dda0b078a8394a9e3d02956655069ab27.tar.bz2 platform_external_iw-3c9cd07dda0b078a8394a9e3d02956655069ab27.zip |
Merge remote-tracking branch 'goog/master' into 'goog/mnc-dr-dev'
Change-Id: Iddc76f624b3655a84643749f430362fd6d5bce6f
-rw-r--r-- | Android.mk | 29 | ||||
-rw-r--r-- | MODULE_LICENSE_BSD_LIKE | 0 | ||||
-rw-r--r-- | NOTICE | 16 | ||||
-rw-r--r-- | android-nl.c | 6 |
4 files changed, 30 insertions, 21 deletions
@@ -1,26 +1,25 @@ LOCAL_PATH := $(call my-dir) -IW_SOURCE_DIR := $(LOCAL_PATH) include $(CLEAR_VARS) -IW_ANDROID_BUILD=y -NO_PKG_CONFIG=y -include $(LOCAL_PATH)/Makefile - -LOCAL_SRC_FILES := $(patsubst %.o,%.c,$(OBJS)) android-nl.c - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH) \ - external/libnl-headers/ +LOCAL_SRC_FILES := \ + iw.c genl.c event.c info.c phy.c \ + interface.c ibss.c station.c survey.c util.c ocb.c \ + mesh.c mpath.c mpp.c scan.c reg.c \ + reason.c status.c connect.c link.c offch.c ps.c cqm.c \ + bitrate.c wowlan.c coalesce.c roc.c p2p.c vendor.c \ + sections.c LOCAL_CFLAGS += -DCONFIG_LIBNL20 LOCAL_LDFLAGS := -Wl,--no-gc-sections -#LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TAGS := eng -LOCAL_STATIC_LIBRARIES := libnl_2 +LOCAL_MODULE_TAGS := debug +LOCAL_STATIC_LIBRARIES := libnl LOCAL_MODULE := iw -$(IW_SOURCE_DIR)/version.c: - $(IW_SOURCE_DIR)/version.sh $(IW_SOURCE_DIR)/version.c +LOCAL_MODULE_CLASS := EXECUTABLES +LOCAL_GENERATED_SOURCES := $(local-generated-sources-dir)/version.c +$(LOCAL_GENERATED_SOURCES) : $(LOCAL_PATH)/version.sh + @mkdir -p $(dir $@) + $(hide) $< $@ include $(BUILD_EXECUTABLE) diff --git a/MODULE_LICENSE_BSD_LIKE b/MODULE_LICENSE_BSD_LIKE new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/MODULE_LICENSE_BSD_LIKE @@ -0,0 +1,16 @@ +Copyright (c) 2007, 2008 Johannes Berg +Copyright (c) 2007 Andy Lutomirski +Copyright (c) 2007 Mike Kershaw +Copyright (c) 2008-2009 Luis R. Rodriguez + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 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); -} |